mergetools / gvimdiff2on commit Merge branch 'cb/t4201-robustify' into maint (01e0c53)
   1. "$MERGE_TOOLS_DIR/vimdiff"