mergetools / gvimdiff3on commit Merge branch 'ak/t5516-typofix' into maint (113bc16)
   1. "$MERGE_TOOLS_DIR/vimdiff"