Code

Merge branch 'jc/maint-1.6.1-checkout-m-custom-merge' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 10 Feb 2010 20:54:15 +0000 (12:54 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 10 Feb 2010 20:54:15 +0000 (12:54 -0800)
commita42332c21723fde9f36b579f6b39a23aa1aac137
treeabeda76e7d7f4f38f2536ae2967eb6d1d6fcba15
parentc6eba1d5b2fdabda46158a01a80bea2a01ef6016
parent6d6f9acc5db0dfae94ef22c9ecbcf7df00f84399
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
builtin-checkout.c
t/t7201-co.sh