mergetools / gvimdiff2on commit Merge branch 'jj/log-doc' into maint (ace08c2)
   1. "$MERGE_TOOLS_DIR/vimdiff"