Comment 7 for bug 40412
Revision history for this message
| John A Meinel (jameinel) wrote Re: show-base for weave merge | #7 |
© 2004
Canonical Ltd.
•
Terms of use
•
Data privacy
•
Contact Launchpad Support
•
Blog
•
Careers
•
System status
•
73416ba
(Get the code!)
So there are some small issues still to be resolved.
I think we can create a 'conglomerate' base without too much difficulty. The internal structures should already have it. Do we want it annotated, though? If you are trying to use it with a 3-way tool, then the annotation lines are probably going to confuse the tool.
foo-id this is my text\n
isn't going to match
this is my text\n