RelNoteson commit Make cherry-pick use rerere for conflict resolution. (aa1a011)
   1Documentation/RelNotes-1.6.0.txt