t / t5100 / msg0009on commit mergetool: honor tempfile configuration when resolving delete conflicts (a298604)
   1This is to fix diff-format documentation.
   2