t / t5100 / msg0016on commit mergetool: honor diff.orderFile (57937f7)
   1and some content
   2