mergetools / vimdiff2on commit Merge branch 'jj/doc-markup-hints-in-coding-guidelines' into maint (5712dcb)
   1. "$MERGE_TOOLS_DIR/vimdiff"