mergetools / gvimdiff3on commit Merge branch 'mm/describe-doc' into maint (b7abfac)
   1. "$MERGE_TOOLS_DIR/vimdiff"