RelNoteson commit apply: allow rerere() to work on --3way results (f2633eb)
   1Documentation/RelNotes/1.7.11.txt