@matheusbsbs / matheus-bagliano / commits / 94468bc1f7
Fork 0

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

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

Junio C Hamano committed Jan 13, 2009 at 01:15 UTC 94468bc1f719b7e0009ec0600b178dd5f412d702

No changes.