Merge branch 'jc/maint-1.6.1-checkout-m-custom-merge'
authorJunio C Hamano <gitster@pobox.com>
Sun, 17 Jan 2010 23:59:40 +0000 (15:59 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 17 Jan 2010 23:59:40 +0000 (15:59 -0800)
commita0db3e5878fd5fa3f54bcf7042ad3d0cb30e07f2
tree90ef8cc9887affd5aee3c1514fb39db845642b31
parent42aac96763a72b5bac73d34640d3a0c6233027a6
parent6d6f9acc5db0dfae94ef22c9ecbcf7df00f84399
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
builtin-checkout.c
t/t7201-co.sh