rerere: record resolution even if file is not in merge base
[git] / RelNotes
1 Documentation/RelNotes-1.5.3.txt