summaryrefslogtreecommitdiff
path: root/rerere.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-10-26 21:40:54 -0700
committerJunio C Hamano <gitster@pobox.com>2010-10-26 21:40:54 -0700
commit75b17fee72a0f78e0ad31728771231f8b3ed4d56 (patch)
tree190461ec1fedaf1a3c5d5d7fc9201a5a6455a144 /rerere.c
parent5a3a484d577d8612f729d64f3a069e63df07ec07 (diff)
parent4e5dd044c62f2a82de083e7cd46cad7b0d3465ae (diff)
downloadgit-75b17fee72a0f78e0ad31728771231f8b3ed4d56.tar.gz
Merge branch 'jf/merge-ignore-ws'
* jf/merge-ignore-ws: merge-recursive: options to ignore whitespace changes merge-recursive --patience ll-merge: replace flag argument with options struct merge-recursive: expose merge options for builtin merge
Diffstat (limited to 'rerere.c')
-rw-r--r--rerere.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/rerere.c b/rerere.c
index 861ca7c815..d260843475 100644
--- a/rerere.c
+++ b/rerere.c
@@ -325,7 +325,7 @@ static int handle_cache(const char *path, unsigned char *sha1, const char *outpu
*/
ll_merge(&result, path, &mmfile[0], NULL,
&mmfile[1], "ours",
- &mmfile[2], "theirs", 0);
+ &mmfile[2], "theirs", NULL);
for (i = 0; i < 3; i++)
free(mmfile[i].ptr);