t / t5100 / msg0015--no-inbody-headerson commit mergetool: honor tempfile configuration when resolving delete conflicts (a298604)
   1From: bogosity
   2  - a list
   3  - of stuff