Viewing all changes in revision 1534.7.186.
- Committer: Aaron Bentley
- Date: 2006-02-23 15:12:47 UTC
- mto: (2027.1.2 revert-subpath-56549)
- mto: This revision was merged to the branch mainline in revision 1575.
- Revision ID: abentley@panoramicfeedback.com-20060223151247-9dc5e11197026907
Made weave conflict markers customizable, standardized defaults
- files modified:
- bzrlib/merge.py
expand all
collapse all
added
removed
