Merge branch 'sb/grep-die-on-unreadable-index'
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"