RelNoteson commit Open external merge tool with original file extensions for all three files (c3d51cd)
   1Documentation/RelNotes-1.5.4.txt