mergetools / gvimdiff2on commit Merge branch 'js/nedmalloc-gcc6-warnings' into maint (05a6d0e)
   1. "$MERGE_TOOLS_DIR/vimdiff"