how does weave/knit merge handle local changes ?

[Robert Collins]

The knit/weave merge logic does not seem to have any hook in it to
consider a local file that is different to the merging revisions. Is
this correct?

Cheers,
Rob
-- 
GPG key available at: <http://www.robertcollins.net/keys.txt>.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 191 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060722/4a0f241b/attachment.pgp