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

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

Junio C Hamano committed Feb 10, 2010 at 12:54 UTC a42332c21723fde9f36b579f6b39a23aa1aac137

No changes.