WIP: Hack in diffs for 'to satisfy' by duplicating most of the object diff code.
Fixed typo.
Changed signature of err.createDiff so output, diff, inspect, and equal are always passed.

Fixes collapsing of subtrees without conflict.
Merge branch 'toSatisfyDiffs'