mergetools / gvimdiff2on commit Merge branch 'maint-1.8.5' into maint-1.9 (d31f3ad)
   1. "$MERGE_TOOLS_DIR/vimdiff"