Merge now performs a 3-way merge similar to git.

Previously merge was working like rebase, applying the changes of each commit from the ancestor to the head.  This does not work because the Log function does not account for multiple parents.