Merge branch 'bw/dir-c-stops-relying-on-the-index'
[git] / mergetools / vimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"