Viewing all changes in revision 6436.3.4.
- Committer: Jelmer Vernooij
- Date: 2012-01-19 14:17:55 UTC
- mfrom: (6437.3.11 2.5)
- mto: (6437.3.14 2.5)
- mto: This revision was merged to the branch mainline in revision 6444.
- Revision ID: jelmer@samba.org-20120119141755-g0kmmvr2dcbb5r0v
Merge lp:bzr/2.5, resolve conflicts.
- files modified:
- bzrlib/branch.py
expand all
collapse all
added
removed
