« back to all changes in this revision
Viewing changes to bzrlib/conflicts.py
- Committer: Patch Queue Manager
- Date: 2011-10-14 05:58:00 UTC
- mfrom: (6015.43.1 doc)
- mto: (6232.1.1 dev_2.4_integration) (6015.44.1 2.4) (6234.1.1 trunk) (6256.1.1 dev_2.4_integration) (6344.1.1 dev_2.4_integration) (6437.2.1 2.5b5-dev)
- mto: This revision was merged to the branch mainline in revision 6233.
- Revision ID: pqm@pqm.ubuntu.com-20111014055800-wksh8stpfxuvcvvh
(mbp) Correction to 'bzr serve' syntax in admin guide (thanks i41) (Martin
Pool)
Pool)
- files modified:
- doc/en/admin-guide/simple-setups.txt
added
removed
bzrlib/conflicts.py
