mergetools / vimdiff2on commit Merge branch 'bc/doc-interpret-trailers-grammofix' into maint (dfc20a5)
   1. "$MERGE_TOOLS_DIR/vimdiff"