mergetools / vimdiff3on commit mergetool: honor tempfile configuration when resolving delete conflicts (a298604)
   1. "$MERGE_TOOLS_DIR/vimdiff"