[MERGE] Small doc fix in conflict resolution

[Martin Albisetti]

Tweaked the conflict resolution explanation slightly to clarify the
full steps needed to mark a conflict as resolved.



Martin
-------------- next part --------------
A non-text attachment was scrubbed...
Name: doc_fix.patch
Type: text/x-diff
Size: 2325 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20080305/00317ddc/attachment.bin