diff options
Diffstat (limited to 'src/merge.c')
| -rw-r--r-- | src/merge.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/merge.c b/src/merge.c index e552b037b..0d89da5a0 100644 --- a/src/merge.c +++ b/src/merge.c @@ -254,7 +254,8 @@ int git_merge__bases_many(git_commit_list **out, git_revwalk *walk, git_commit_l return 0; } -int git_repository_mergehead_foreach(git_repository *repo, +int git_repository_mergehead_foreach( + git_repository *repo, git_repository_mergehead_foreach_cb cb, void *payload) { @@ -287,7 +288,7 @@ int git_repository_mergehead_foreach(git_repository *repo, goto cleanup; if (cb(&oid, payload) != 0) { - error = GIT_EUSER; + error = giterr_user_cancel(); goto cleanup; } |