mergetools / gvimdiff3on commit Merge branch 'mm/log-format-raw-doc' into maint (4be33f7)
   1. "$MERGE_TOOLS_DIR/vimdiff"