© 2004
Canonical Ltd.
•
Terms of use
•
Data privacy
•
Contact Launchpad Support
•
Blog
•
Careers
•
System status
•
1b1ed1a
(Get the code!)
Note that plain "bzr merge" between those two revisions also has a Contents Conflict on Changlog and creates Changlog.OTHER. It was deleted in THIS, but it existed and was seen to be changed since the deleted revision. Vincent and I will poke at why there is the extra revision that seems superfluous.