diff options
Diffstat (limited to 'src/merge.c')
| -rw-r--r-- | src/merge.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/merge.c b/src/merge.c index f1778c950..5640be56b 100644 --- a/src/merge.c +++ b/src/merge.c @@ -288,7 +288,7 @@ int git_repository_mergehead_foreach( goto cleanup; if ((error = cb(&oid, payload)) != 0) { - GITERR_CALLBACK(error); + giterr_set_after_callback(error); goto cleanup; } |