Comment 1 for bug 781838

Ah, this appears to be a fairly trivial bug in the “oops this conflict is too hard, I give up” case. i.e. the plugin is trying to defer to bzr's default merge logic.

The fix is pretty easy. I'll try to extend the test coverage to cover this case while I'm here.

So for this crash disabling the plugin will give the same results as the fixed plugin, so temporarily disabling the plugin is a good workaround.