Viewing all changes in revision 6389.
- Committer: Patch Queue Manager
- Date: 2011-12-20 14:38:36 UTC
- mfrom: (6388.1.2 merge-remove-deprecated)
- Revision ID: pqm@pqm.ubuntu.com-20111220143836-170sokw0ugkthh1t
(jelmer) Remove some merge methods deprecated in bzr 2.1. (Jelmer Vernooij)
- files modified:
- bzrlib/merge.py
expand all
collapse all
added
removed
