RelNoteson commit builtin-merge: show user-friendly error messages for fast-forward too. (e2ced7d)
   1Documentation/RelNotes-1.6.5.txt