Viewing all changes in revision 1575.
- Committer: Canonical.com Patch Queue Manager
- Date: 2006-02-23 22:35:50 UTC
- mfrom: (1534.7.186 Transactional Tree Transforms)
- Revision ID: pqm@pqm.ubuntu.com-20060223223550-c0c332a9bd74e247
Made weave conflict markers customizable, standardized defaults
- files modified:
- bzrlib/merge.py
expand all
collapse all
added
removed
