Viewing all changes in revision 4634.101.7.
- Committer: John Arbash Meinel
- Date: 2009-12-04 00:59:09 UTC
- mto: This revision was merged to the branch mainline in revision 4889.
- Revision ID: john@arbash-meinel.com-20091204005909-r5htm5irxu7n44di
Start working on the ability to drop a .BASE file for --weave and --lca merge.
The main issue at this point is what to do about LCA's 'conflicted' states.
The main issue at this point is what to do about LCA's 'conflicted' states.
- files modified:
- bzrlib/merge.py
expand all
collapse all
added
removed
