Merge branch 'en/fast-import-merge-doc'
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"