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