Viewing all changes in revision 1185.12.99.
- Committer: Aaron Bentley
- Date: 2005-10-24 17:42:46 UTC
- mto: (1185.25.1)
- mto: This revision was merged to the branch mainline in revision 1488.
- Revision ID: abentley@panoramicfeedback.com-20051024174246-7b1be2b168413272
Handled conflicts with versioned files better
- files modified:
- bzrlib/merge.py
expand all
collapse all
added
removed
