mergetools / vimdiff2on commit Merge tag 'v2.10.4' into maint-2.11 (05bb78a)
   1. "$MERGE_TOOLS_DIR/vimdiff"