t / t5100 / msg0017on commit mergetool: honor tempfile configuration when resolving delete conflicts (a298604)
   1New content here
   2