diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-10-27 06:40:54 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-10-27 06:40:54 +0200 |
| commit | 75b17fee72a0f78e0ad31728771231f8b3ed4d56 (patch) | |
| tree | 190461ec1fedaf1a3c5d5d7fc9201a5a6455a144 /builtin/checkout.c | |
| parent | Merge branch 'ml/completion-zsh' (diff) | |
| parent | merge-recursive: options to ignore whitespace changes (diff) | |
| download | git-75b17fee72a0f78e0ad31728771231f8b3ed4d56.tar.xz git-75b17fee72a0f78e0ad31728771231f8b3ed4d56.zip | |
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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/checkout.c b/builtin/checkout.c index a54583b3a4..9240fafb2a 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); |