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