t / t3900 / UTF-16.txton commit mergetool: honor diff.orderFile (57937f7)
   1