Viewing all changes in revision 1534.7.146.
- Committer: Aaron Bentley
- Date: 2006-02-10 15:17:24 UTC
- mto: (1558.1.4 Aaron's integration) (1534.9.2 Transactional Tree Transforms) (1185.50.82 bzr-jam-integration) (2027.1.2 revert-subpath-56549)
- mto: This revision was merged to the branch mainline in revision 1558.
- Revision ID: abentley@panoramicfeedback.com-20060210151724-603e0706e9db2987
Fixed merge so tree root is auto-preserved, not by conflict resolution
- files modified:
- bzrlib/merge.py
expand all
collapse all
added
removed
