t / t5100 / msg0001on commit mergetool: honor diff.orderFile (57937f7)
   1Here is a patch from A U Thor.
   2