mergetools / gvimdiff2on commit Merge branch 'maint-1.8.1' into maint-1.8.2 (f59bebb)
   1. "$MERGE_TOOLS_DIR/vimdiff"