mergetools / vimdiff3on commit Merge branch 'sb/t6031-typofix' (12ba0e7)
   1. "$MERGE_TOOLS_DIR/vimdiff"