Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
t6022: Add testcase for merging a renamed file with a simple change
[gitweb.git]
/
merge-file.c
diff --git
a/merge-file.c
b/merge-file.c
index db4d0d50d32d8852d1cb5173125e4173c3badb49..f7f4533926e35867725db00f0c89522c4b290898 100644
(file)
--- a/
merge-file.c
+++ b/
merge-file.c
@@
-37,7
+37,7
@@
static void *three_way_filemerge(const char *path, mmfile_t *base, mmfile_t *our
* common ancestor.
*/
merge_status = ll_merge(&res, path, base, NULL,
- our, ".our", their, ".their",
0
);
+ our, ".our", their, ".their",
NULL
);
if (merge_status < 0)
return NULL;