To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
Viewing all changes in revision 3363.17.21.
- Committer: Aaron Bentley
- Date: 2008-10-07 21:01:07 UTC
- mto: (3363.19.2 fix-iter-changes)
- mto: This revision was merged to the branch mainline in revision 3777.
- Revision ID: aaron@aaronbentley.com-20081007210107-pdm9xz7ae1ouzv39
Conflicts are handled when merging from preview trees
- files modified:
- bzrlib/merge.py
expand all
collapse all
added
removed
