Add 'indifferentMerge' functionality.

This will be useful for implementing issue #8, although I should also
write a less indifferent merge that complains if the environment has
changed.