diff options
Diffstat (limited to 'src/merge_file.c')
| -rw-r--r-- | src/merge_file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/merge_file.c b/src/merge_file.c index a36c1986c..0647a5df6 100644 --- a/src/merge_file.c +++ b/src/merge_file.c @@ -130,7 +130,7 @@ static int merge_file__xdiff( if ((xdl_result = xdl_merge(&ancestor_mmfile, &our_mmfile, &their_mmfile, &xmparam, &mmbuffer)) < 0) { - giterr_set(GITERR_MERGE, "failed to merge files"); + git_error_set(GIT_ERROR_MERGE, "failed to merge files"); error = -1; goto done; } |