RelNoteson commit i18n: advice: internationalize message for conflicts (8785c42)
   1Documentation/RelNotes/2.9.0.txt