t / t5100 / patch0007on commit mergetool: honor tempfile configuration when resolving delete conflicts (a298604)
   1