diff options
| author | Russell Belfer <rb@github.com> | 2013-12-09 09:44:03 -0800 |
|---|---|---|
| committer | Russell Belfer <rb@github.com> | 2013-12-11 10:57:50 -0800 |
| commit | 26c1cb91beccb44425864bd233ed0e35f5801868 (patch) | |
| tree | 378f665d0adebca36a14a590f2103f2e5cd6c9ac /src/merge.c | |
| parent | f10d7a368fa4af28b1e6f082349ffa4f62b3c00e (diff) | |
| download | libgit2-26c1cb91beccb44425864bd233ed0e35f5801868.tar.gz | |
One more rename/cleanup for callback err functions
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; } |