mergetools / gvimdiff2on commit Merge branch 'dl/branch-error-message' into maint (cbac706)
   1. "$MERGE_TOOLS_DIR/vimdiff"