mergetools / gvimdiffon commit Merge branch 'maint-1.9' into maint (bba6acb)
   1. "$MERGE_TOOLS_DIR/vimdiff"