Non-expected conflict

[Martin Pool]

On 21 Mar 2006, Aaron Bentley <aaron.bentley at utoronto.ca> wrote:

> Which is exactly where weave merge would rock, if it wasn't busted.

It should be un-busted again in dapper, and should indeed have a better
solution to this problem, though probably still able to be improved.
Perhaps Gustavo could try it on this merge or similar situations?

-- 
Martin
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 191 bytes
Desc: Digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060322/c27240cc/attachment.pgp