mergetools / vimdiff3on commit Merge branch 'jk/tempfile-ferror-fclose-confusion' into maint (f63df94)
   1. "$MERGE_TOOLS_DIR/vimdiff"