mergetools / gvimdiff2on commit Merge branch 'sc/fmt-merge-msg-doc-markup-fix' into maint (6afadbd)
   1. "$MERGE_TOOLS_DIR/vimdiff"