« back to all changes in this revision
Viewing changes to bzrlib/tests/blackbox/test_conflicts.py
- Committer: Guilherme Salgado
- Date: 2010-01-07 14:03:46 UTC
- mto: This revision was merged to the branch mainline in revision 4955.
- Revision ID: salgado@canonical.com-20100107140346-3lq4lgspf4dllk9q
Tweak the text to check to assert the meat of the diff is what we expect, instead of just checking it matches some regexps
- files modified:
- bzrlib/tests/test_shelf_ui.py
added
removed
bzrlib/tests/blackbox/test_conflicts.py
