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