t / t5100 / msg0017on commit mergetool: honor diff.orderFile (57937f7)
   1New content here
   2