Viewing all changes in revision 1185.16.33.
- Committer: Martin Pool
- Date: 2005-10-13 07:06:01 UTC
- mto: (1185.41.1 bzr.sftp) (1464.1.1) (1534.1.1 integration) (1495.1.4) (1505.1.16 bzr-bound-branch) (1508.1.15) (1526.1.3 run_tests_twice_for_i18n) (1540.1.3 bzr.dev (Main development branch)) (1685.1.1 bzr-encoding) (1553.5.1 bzr.dev (Main development branch)) (1608.2.1 bzr.mbp.escape-stores)
- mto: This revision was merged to the branch mainline in revision 1454.
- Revision ID: mbp@sourcefrog.net-20051013070601-8e1e177942d5614d
- move 'conflict' and 'resolved' from shipped plugin to regular builtins
- files renamed:
- bzrlib/plugins/conflicts.py => bzrlib/conflicts.py
- files modified:
- bzrlib/builtins.py
expand all
collapse all
added
removed
