Viewing all changes in revision 1185.81.31.
- Committer: Aaron Bentley
- Date: 2006-05-25 22:01:44 UTC
- mto: This revision was merged to the branch mainline in revision 1732.
- Revision ID: aaron.bentley@utoronto.ca-20060525220144-aad0dd7452ed8f9d
Use patience for two-way merge
- files modified:
- bzrlib/tests/test_textmerge.py
expand all
collapse all
added
removed
