mergetools / gvimdiffon commit Merge branch 'rs/pretty-format-color-doc-fix' into maint (4efd8e6)
   1. "$MERGE_TOOLS_DIR/vimdiff"