© 2004
Canonical Ltd.
•
Terms of use
•
Data privacy
•
Contact Launchpad Support
•
Blog
•
Careers
•
System status
•
1b1ed1a
(Get the code!)
So as I see it, we could add 2 new flags. One for "if you have to do any textual merging, conflict" and one for "conflict on every content change". They seem easy enough to implement and maintain. The only question is whether it would actually be more confusing for users to see them when looking at "bzr help merge".