« back to all changes in this revision
Viewing changes to bzrlib/conflicts.py
- Committer: Tim Penhey
- Date: 2008-04-25 11:23:00 UTC
- mto: (3473.1.1 ianc-integration)
- mto: This revision was merged to the branch mainline in revision 3474.
- Revision ID: tim@penhey.net-20080425112300-sf5soa5dg2d37kvc
Added tests.
- files added:
- bzrlib/tests/blackbox/test_alias.py
- files modified:
- bzrlib/builtins.py
added
removed
bzrlib/conflicts.py
