Comment 3 for bug 402022

This still occurs with the current tip of qbzr.

It would be nice if qbzr could get what it wants without overriding cmd_merge, which seems likely to cause such breakage, and instead have hooks.