t / t5100 / rfc2047-info-0005on commit mergetool: honor diff.orderFile (57937f7)
   1Subject: (a)
   2