weave-cli 0.3.6

Entity-level semantic merge CLI. Resolves conflicts at the function/class level instead of lines.