mergetools / vimdiff3on commit Merge branch 'js/nedmalloc-gcc6-warnings' (ffdcac4)
   1. "$MERGE_TOOLS_DIR/vimdiff"