Viewing all changes in revision 1585.
- Committer: Canonical.com Patch Queue Manager
- Date: 2006-03-01 02:36:59 UTC
- mfrom: (1551.2.17 Aaron's small fixes)
- Revision ID: pqm@pqm.ubuntu.com-20060301023659-bef0c770dffa2805
Fixed conflict commands
- files added:
- bzrlib/tests/blackbox/test_conflicts.py
- files modified:
- bzrlib/conflicts.py
expand all
collapse all
added
removed
