diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-02-10 12:54:15 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-02-10 12:54:15 -0800 |
| commit | a42332c21723fde9f36b579f6b39a23aa1aac137 (patch) | |
| tree | abeda76e7d7f4f38f2536ae2967eb6d1d6fcba15 /builtin-checkout.c | |
| parent | Merge branch 'rs/maint-archive-match-pathspec' into maint (diff) | |
| parent | checkout -m path: fix recreating conflicts (diff) | |
| download | tgif-a42332c21723fde9f36b579f6b39a23aa1aac137.tar.xz | |
Merge branch 'jc/maint-1.6.1-checkout-m-custom-merge' into maint
* jc/maint-1.6.1-checkout-m-custom-merge:
checkout -m path: fix recreating conflicts
Conflicts:
t/t7201-co.sh
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 2708669383..67229fc216 100644 --- a/builtin-checkout.c +++ b/builtin-checkout.c @@ -167,7 +167,7 @@ static int checkout_merged(int pos, struct checkout *state) fill_mm(active_cache[pos+2]->sha1, &theirs); status = ll_merge(&result_buf, path, &ancestor, - &ours, "ours", &theirs, "theirs", 1); + &ours, "ours", &theirs, "theirs", 0); free(ancestor.ptr); free(ours.ptr); free(theirs.ptr); |