RelNoteson commit mergetool: honor diff.orderFile (57937f7)
   1Documentation/RelNotes/2.11.0.txt