« back to all changes in this revision
Viewing changes to bzrlib/tests/blackbox/test_merge.py
- Committer: Vincent Ladeuil
- Date: 2010-02-05 10:27:33 UTC
- mto: (5008.1.1 integration)
- mto: This revision was merged to the branch mainline in revision 5009.
- Revision ID: v.ladeuil+lp@free.fr-20100205102733-8wpjnqz6g4nvrbfu
All Conflict action method names start with 'action_' to avoid potential namespace collisions
- files modified:
- bzrlib/conflicts.py
added
removed
bzrlib/tests/blackbox/test_merge.py
