Merge tag 'v2.9.5' into maint-2.10
[git] / mergetools / gvimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"