Viewing all changes in revision 2644.1.1.
- Committer: Wouter van Heyst
- Date: 2007-07-21 14:11:17 UTC
- mto: This revision was merged to the branch mainline in revision 2645.
- Revision ID: larstiq@larstiq.dyndns.org-20070721141117-ogghgpjyh02h8fri
Fix bug #127115 by checking for self.other_rev_id being None in Merger.set_pending()
- files modified:
- bzrlib/merge.py
expand all
collapse all
added
removed
