git-merge-recursive: learn to honor merge.conflictstyle
[git] / RelNotes
1 Documentation/RelNotes-1.6.0.1.txt