Fixed typo.
Changed signature of err.createDiff so output, diff, inspect, and equal are always passed.

Fixes collapsing of subtrees without conflict.