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

Merge branch 'js/maint-merge-recursive-r-d-conflict'

* js/maint-merge-recursive-r-d-conflict: merge-recursive: mark rename/delete conflict as unmerged

Junio C Hamano committed Jan 7, 2009 at 00:09 UTC ff32340669a5521ca2b4b547b4853bfe22f60386

No changes.