mergetools / vimdiff3on commit Merge branch 'ks/typofix-commit-c-comment' into maint (ecab58c)
   1. "$MERGE_TOOLS_DIR/vimdiff"