RelNoteson commit Show a failure of rebase -p if the merge had a conflict (03c4829)
   1Documentation/RelNotes-1.6.1.txt