Viewing all changes in revision 1534.10.18.
- Committer: Aaron Bentley
- Date: 2006-04-05 01:46:15 UTC
- mto: (2027.1.2 revert-subpath-56549)
- mto: This revision was merged to the branch mainline in revision 1647.
- Revision ID: aaron.bentley@utoronto.ca-20060405014615-660100e563d684ec
Defined all new Conflict types
- files modified:
- bzrlib/conflicts.py
expand all
collapse all
added
removed
