Andrew's git / gitweb.git / diff
?
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)
* jc/maint-1.6.1-checkout-m-custom-merge:
checkout -m path: fix recreating conflicts

Conflicts:
t/t7201-co.sh

No differences found