Comment 2 for bug 40412
Revision history for this message
| GuilhemBichot (guilhem-bichot) wrote Re: show-base for weave merge | #2 |
© 2004
Canonical Ltd.
•
Terms of use
•
Data privacy
•
Contact Launchpad Support
•
Blog
•
Careers
•
System status
•
73416ba
(Get the code!)
Now weave merge is in hot mode again, Canonical improved it largely mid-2008 and this is what MySQL is using for all their difficult criss-cross merges. It would be really great to have a base (and properly annotated); currently I have to navigate in gannotate on the local, remote and merged files to find out what each conflicting change was about.