mergetools / gvimdiff2on commit Merge branch 'js/t3404-typofix' into maint (0726f13)
   1. "$MERGE_TOOLS_DIR/vimdiff"