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