t / t5100 / patch0008on commit mergetool: honor diff.orderFile (57937f7)
   1