Andrew's git / gitweb.git / Documentation/RelNotes-1.5.5.4.txt
?
Documentation / RelNotes-1.5.5.4.txton commit merge.conflictstyle: choose between "merge" and "diff3 -m" styles (b541248)
   1GIT v1.5.5.4 Release Notes
   2==========================
   3
   4Fixes since v1.5.5.4
   5--------------------
   6
   7 * "git name-rev --all" used to segfault.