Viewing all changes in revision 1534.10.4.
- Committer: Aaron Bentley
- Date: 2006-03-09 22:54:29 UTC
- mto: (2027.1.2 revert-subpath-56549)
- mto: This revision was merged to the branch mainline in revision 1647.
- Revision ID: abentley@panoramicfeedback.com-20060309225429-9b81ae72b0f23221
Implemented conflict serialization
- files modified:
- bzrlib/conflicts.py
expand all
collapse all
added
removed
