Viewing all changes in revision 4634.101.9.
- Committer: John Arbash Meinel
- Date: 2009-12-04 04:02:11 UTC
- mto: This revision was merged to the branch mainline in revision 4889.
- Revision ID: john@arbash-meinel.com-20091204040211-7a2ki1g5y2rbmq89
Reverse the .BASE values for --lca and conflicted lines.
It is a bit of an option whether we include or remove them. But including
them in BASE means they will likely be removed in the final target,
and we would rather have them and remove them manually, than the opposite.
It is a bit of an option whether we include or remove them. But including
them in BASE means they will likely be removed in the final target,
and we would rather have them and remove them manually, than the opposite.
- files modified:
- bzrlib/tests/test_merge.py
expand all
collapse all
added
removed
