diff options
| author | nulltoken <emeric.fermas@gmail.com> | 2013-01-10 23:27:13 +0100 |
|---|---|---|
| committer | nulltoken <emeric.fermas@gmail.com> | 2013-01-11 19:30:58 +0100 |
| commit | 4a0ac175ca56d25f82e43825632d9fe7f4dc1578 (patch) | |
| tree | 92ee9694bf9d6192f2a47d07a93ffd70c1bd32c9 /src | |
| parent | 635c235cf320428775529285bebf6f238fc71184 (diff) | |
| download | libgit2-4a0ac175ca56d25f82e43825632d9fe7f4dc1578.tar.gz | |
checkout: Deploy EMERGECONFLICT usage
Diffstat (limited to 'src')
| -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; } |