Merge tag 'v2.10.4' into maint-2.11
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"