Viewing all changes in revision 2645.
- Committer: Canonical.com Patch Queue Manager
- Date: 2007-07-21 16:36:03 UTC
- mfrom: (2644.1.2 bug-127115)
- Revision ID: pqm@pqm.ubuntu.com-20070721163603-p17kh2wgzkhbef1d
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
