Merge branch 'jb/diff-no-index-no-abbrev'
[git] / mergetools / vimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"