diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-01-17 23:59:40 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-17 23:59:40 (GMT) |
| commit | a0db3e5878fd5fa3f54bcf7042ad3d0cb30e07f2 (patch) | |
| tree | 90ef8cc9887affd5aee3c1514fb39db845642b31 /builtin-checkout.c | |
| parent | 42aac96763a72b5bac73d34640d3a0c6233027a6 (diff) | |
| parent | 6d6f9acc5db0dfae94ef22c9ecbcf7df00f84399 (diff) | |
| download | git-a0db3e5878fd5fa3f54bcf7042ad3d0cb30e07f2.zip git-a0db3e5878fd5fa3f54bcf7042ad3d0cb30e07f2.tar.gz git-a0db3e5878fd5fa3f54bcf7042ad3d0cb30e07f2.tar.bz2 | |
Merge branch 'jc/maint-1.6.1-checkout-m-custom-merge'
* 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 793542e..e44e238 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); |