@matheusbsbs / matheus-bagliano / commits / a0db3e5878
Fork 0

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

Junio C Hamano committed Jan 17, 2010 at 15:59 UTC a0db3e5878fd5fa3f54bcf7042ad3d0cb30e07f2

No changes.