diff options
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; } |