diff options
Diffstat (limited to 'src/merge.c')
| -rw-r--r-- | src/merge.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/merge.c b/src/merge.c index d5bc6a39c..6f73fc14a 100644 --- a/src/merge.c +++ b/src/merge.c @@ -287,10 +287,8 @@ int git_repository_mergehead_foreach( if ((error = git_oid_fromstr(&oid, line)) < 0) goto cleanup; - if (cb(&oid, payload) != 0) { - error = giterr_user_cancel(); + if ((error = GITERR_CALLBACK( cb(&oid, payload) )) != 0) goto cleanup; - } ++line_num; } |