t / t5100 / msg0009on commit mergetool: honor diff.orderFile (57937f7)
   1This is to fix diff-format documentation.
   2