Comment 13 for bug 40412
Revision history for this message
| GuilhemBichot (guilhem-bichot) wrote Re: show-base for weave merge | #13 |
© 2004
Canonical Ltd.
•
Terms of use
•
Data privacy
•
Contact Launchpad Support
•
Blog
•
Careers
•
System status
•
73416ba
(Get the code!)
Sorry, it was wrong usage from my part, I tried a wrong branch!
Now I got your branch, and I see .BASE files with --weave.
However, I have 33 files with text conflicts (according to "bzr conflicts --text"), but for two of them there is no BASE file.
Here is the single conflict region of one such file without a BASE file:
<<<<<<< TREE
--echo 'Bug: value in information schema does not match'
=======
>>>>>>> MERGE-SOURCE
and for the other file:
<<<<<<< TREE
'Bug: value in information schema does not match'
=======
>>>>>>> MERGE-SOURCE
Let me know if you'd like instructions to download those branches.