mergetools / gvimdiff3on commit Merge branch 'jt/fast-export-copy-modify-fix' into maint (120ce97)
   1. "$MERGE_TOOLS_DIR/vimdiff"