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