Merge branch 'maint-2.7' into maint-2.8
[git] / mergetools / gvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"