summaryrefslogtreecommitdiff
path: root/builtin/checkout.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-10-27 04:40:54 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-10-27 04:40:54 (GMT)
commit75b17fee72a0f78e0ad31728771231f8b3ed4d56 (patch)
tree190461ec1fedaf1a3c5d5d7fc9201a5a6455a144 /builtin/checkout.c
parent5a3a484d577d8612f729d64f3a069e63df07ec07 (diff)
parent4e5dd044c62f2a82de083e7cd46cad7b0d3465ae (diff)
downloadgit-75b17fee72a0f78e0ad31728771231f8b3ed4d56.zip
git-75b17fee72a0f78e0ad31728771231f8b3ed4d56.tar.gz
git-75b17fee72a0f78e0ad31728771231f8b3ed4d56.tar.bz2
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 'builtin/checkout.c')
-rw-r--r--builtin/checkout.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/checkout.c b/builtin/checkout.c
index a54583b..9240faf 100644
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -161,7 +161,7 @@ static int checkout_merged(int pos, struct checkout *state)
* merge.renormalize set, too
*/
status = ll_merge(&result_buf, path, &ancestor, "base",
- &ours, "ours", &theirs, "theirs", 0);
+ &ours, "ours", &theirs, "theirs", NULL);
free(ancestor.ptr);
free(ours.ptr);
free(theirs.ptr);