RelNoteson commit git-merge: fail correctly when we cannot fast forward. (7d79c86)
   1Documentation/RelNotes-1.5.0.3.txt