diff options
Diffstat (limited to 'src/stash.c')
| -rw-r--r-- | src/stash.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/stash.c b/src/stash.c index 0c5cd1d2a..a7a288c25 100644 --- a/src/stash.c +++ b/src/stash.c @@ -761,7 +761,7 @@ int git_stash_apply( goto cleanup; if (git_index_has_conflicts(unstashed_index)) { - error = GIT_EMERGECONFLICT; + error = GIT_ECONFLICT; goto cleanup; } } |