mergetools / vimdiff2on commit Merge branch 'maint-2.6' into maint-2.7 (dc58c85)
   1. "$MERGE_TOOLS_DIR/vimdiff"