mergetools / vimdiff3on commit Merge branch 'jk/fast-import-fixes' into maint (0448134)
   1. "$MERGE_TOOLS_DIR/vimdiff"