t / t5100 / msg0016on commit mergetool: honor tempfile configuration when resolving delete conflicts (a298604)
   1and some content
   2