Viewing all changes in revision 1551.8.23.
- Committer: Aaron Bentley
- Date: 2006-09-06 12:00:01 UTC
- mto: (1731.2.9 nested-trees) (2234.6.1 bzr.0.14) (2229.2.4 reserved-ids) (2323.6.9 0.15-integration) (1551.19.24 Aaron's mergeable stuff)
- mto: This revision was merged to the branch mainline in revision 1987.
- Revision ID: aaron.bentley@utoronto.ca-20060906120001-b3d70c642260d590
Tweaked conflict message to be more understandable
- files modified:
- bzrlib/conflicts.py
expand all
collapse all
added
removed
