mergetools / vimdiff3on commit Merge branch 'jg/cguide-we-cannot-count' into maint (e8281f0)
   1. "$MERGE_TOOLS_DIR/vimdiff"