~bzr-pqm/bzr/bzr.dev

Committer: Aaron Bentley
Date: 2006-03-01 18:16:31 UTC
mto: (1551.19.24 Aaron's mergeable stuff) (1731.2.9 nested-trees) (2234.6.1 bzr.0.14) (2229.2.4 reserved-ids) (2323.6.9 0.15-integration) (1558.4.5 Aaron's integration)
mto: This revision was merged to the branch mainline in revision 1597.
Revision ID: abentley@panoramicfeedback.com-20060301181631-f3b73117aa68b73f

Updated docs to clarify conflict handling

added added

removed removed