rerere: fix for merge.conflictstyle
[git/raj.git] / RelNotes
blob277f28f953706b6de9fb1533e298985521d72996
1 Documentation/RelNotes/1.8.5.5.txt