Viewing all changes in revision 2590.2.8.
- Committer: Aaron Bentley
- Date: 2007-07-06 17:21:34 UTC
- mto: (2590.2.12 changes-merge)
- mto: This revision was merged to the branch mainline in revision 2603.
- Revision ID: abentley@panoramicfeedback.com-20070706172134-kz3k30d2pu61qngi
Restore conflict handling changes
- files modified:
- bzrlib/merge.py
expand all
collapse all
added
removed
