Merge branch 'maint-1.8.5' into maint-1.9
[git] / mergetools / gvimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"