mergetools / vimdiff2on commit Merge branch 'ik/userdiff-html-h-element-fix' into maint (b8a4e89)
   1. "$MERGE_TOOLS_DIR/vimdiff"