mergetools / gvimdiff2on commit Merge branch 'mh/fast-import-optimize-current-from' into maint (f9610bc)
   1. "$MERGE_TOOLS_DIR/vimdiff"