mergetools / vimdiff2on commit Merge branch 'maint-2.11' into maint (ebb1f6f)
   1. "$MERGE_TOOLS_DIR/vimdiff"