To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
Viewing all changes in revision 1563.1.1.
- Committer: Robert Collins
- Date: 2006-02-21 21:53:59 UTC
- mto: (1594.2.4 integration) (1570.1.1 integration)
- mto: This revision was merged to the branch mainline in revision 1566.
- Revision ID: robertc@robertcollins.net-20060221215359-78567cab94e7b739
Fixup internally generated deprecation warning from merge_inner.
- files modified:
- bzrlib/merge.py
expand all
collapse all
added
removed
