Merge branch 'jc/doc-commit-only'
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"