Documentation / RelNotes-1.5.5.4.txton commit git-merge documentation: describe how conflict is presented (70a3f89)
   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.