Viewing all changes in revision 1551.10.38.
- Committer: Aaron Bentley
- Date: 2007-03-12 19:56:41 UTC
- mto: (1551.19.24 Aaron's mergeable stuff)
- mto: This revision was merged to the branch mainline in revision 2353.
- Revision ID: abentley@panoramicfeedback.com-20070312195641-ezjnseqwgjtkh0iu
merge3 auto-detects line endings for conflict markers
- files modified:
- bzrlib/merge3.py
expand all
collapse all
added
removed
