Merge branch 'da/mergetool-delete-delete-conflict'
[gitweb.git] / Documentation / RelNotes / 2.5.4.txt
2015-09-28 Git 2.5.4 v2.5.4