mergetools / vimdiff3on commit Merge branch 'js/commit-slab-decl-fix' (7a3ea66)
   1. "$MERGE_TOOLS_DIR/vimdiff"