diff options
| author | Vicent Martà <vicent@github.com> | 2013-01-11 10:59:31 -0800 |
|---|---|---|
| committer | Vicent Martà <vicent@github.com> | 2013-01-11 10:59:31 -0800 |
| commit | 3f4437e714874ed10ce20fb32ca2dad3ca6f80ee (patch) | |
| tree | 7120e039fceca5871ef912101ef9dddde50bea39 /src/checkout.c | |
| parent | d0b14cea0e1ff09af83a801c1a9cf1a431d46d0c (diff) | |
| parent | f3738eba56cd6bafe1befea90a35a0b26600491c (diff) | |
| download | libgit2-3f4437e714874ed10ce20fb32ca2dad3ca6f80ee.tar.gz | |
Merge pull request #1227 from nulltoken/topic/emergeconflict
Introduce EMERGECONFLICT
Diffstat (limited to 'src/checkout.c')
| -rw-r--r-- | src/checkout.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/checkout.c b/src/checkout.c index 4d6f99463..cca66c34f 100644 --- a/src/checkout.c +++ b/src/checkout.c @@ -616,7 +616,7 @@ static int checkout_get_actions( { giterr_set(GITERR_CHECKOUT, "%d conflicts prevent checkout", (int)counts[CHECKOUT_ACTION__CONFLICT]); - error = -1; + error = GIT_EMERGECONFLICT; goto fail; } |