kanso/kanso — pull request #402 by thriqon (2013-11-25 21:01:41+00:00)
Title: Objects Merge: Ignoring Conflicts wasn't recursive

The ignore_conflicts flag was not propagated to inner function calls,
leading to false error messages when overriding deeper properties of
objects.

Tests included.

Fixes #401.