t / t5100 / msg0016--no-inbody-headerson commit mergetool: honor tempfile configuration when resolving delete conflicts (a298604)
   1Date: bogus
   2
   3and some content
   4