| commit | a42332c21723fde9f36b579f6b39a23aa1aac137 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 10 Feb 2010 20:54:15 +0000 (10 12:54 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 10 Feb 2010 20:54:15 +0000 (10 12:54 -0800) | ||
| tree | abeda76e7d7f4f38f2536ae2967eb6d1d6fcba15 | treesnapshot (tar.gz zip) |
| parent | c6eba1d5b2fdabda46158a01a80bea2a01ef6016 | commitdiff |
| parent | 6d6f9acc5db0dfae94ef22c9ecbcf7df00f84399 | commitdiff |
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
* jc/maint-1.6.1-checkout-m-custom-merge:
checkout -m path: fix recreating conflicts
Conflicts:
t/t7201-co.sh
| builtin-checkout.c | diff1 | diff2 | blobhistory |
| t/t7201-co.sh | diff1 | diff2 | blobhistory |