Viewing all changes in revision 1732.
- Committer: Canonical.com Patch Queue Manager
- Date: 2006-05-25 22:58:41 UTC
- mfrom: (1185.81.31 bzr.patience)
- Revision ID: pqm@pqm.ubuntu.com-20060525225841-625f0ece2f64af43
Use patience for two-way merge
- files modified:
- bzrlib/tests/test_textmerge.py
expand all
collapse all
added
removed
