Merge branch 'mm/config-intro-in-git-doc'
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"