merge-recursive: mark rename/delete conflict as unmerged
[git] / RelNotes
1 Documentation/RelNotes-1.6.1.txt