t / t5100 / msg0001on commit mergetool: honor tempfile configuration when resolving delete conflicts (a298604)
   1Here is a patch from A U Thor.
   2