« back to all changes in this revision
Viewing changes to bzrlib/diff.py
- Committer: Aaron Bentley
- Date: 2005-07-15 13:13:40 UTC
- mto: This revision was merged to the branch mainline in revision 923.
- Revision ID: abentley@panoramicfeedback.com-20050715131340-c2ff3983303bf438
Fixed conflict handling for missing merge targets
- files modified:
- bzrlib/merge_core.py
added
removed
bzrlib/diff.py
