Merge branch 'fc/do-not-use-the-index-in-add-to-index'
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"