It happens that I had a merge that was hit by this, and I had a burst of inspiration about how to fix it without too much effort, so I've done that and proposed a merge for it.
On the tangent, I like Robert's idea for showing "(used news_merge)" in the 'bzr merge' output.
It happens that I had a merge that was hit by this, and I had a burst of inspiration about how to fix it without too much effort, so I've done that and proposed a merge for it.
On the tangent, I like Robert's idea for showing "(used news_merge)" in the 'bzr merge' output.