Viewing all changes in revision 4847.
- Committer: Canonical.com Patch Queue Manager
- Date: 2009-12-01 10:22:12 UTC
- mfrom: (4798.7.3 fix-213184)
- Revision ID: pqm@pqm.ubuntu.com-20091201102212-n4fvh6frief0fltd
Document how to resolve tag conflicts. (Neil Martinsen-Burrell,
#213184)
#213184)
- files modified:
- bzrlib/conflicts.py
expand all
collapse all
added
removed
