Viewing all changes in revision 3955.2.1.
- Committer: John Arbash Meinel
- Date: 2009-01-23 16:54:53 UTC
- mto: (3948.1.6 spurious-conflicts)
- mto: This revision was merged to the branch mainline in revision 3967.
- Revision ID: john@arbash-meinel.com-20090123165453-uh76h1nfqzshc707
Change the workings of merge_content to be lca aware.
- files modified:
- bzrlib/merge.py
expand all
collapse all
added
removed
