merge-recursive: don't segfault while handling rename clashes
[git] / RelNotes
1 Documentation/RelNotes-1.6.1.4.txt