Viewing all changes in revision 5947.

Committer: Canonical.com Patch Queue Manager
Date: 2011-06-01 09:15:13 UTC
mfrom: <a title="Merged From 5939.2.2" href="/~bzr-pqm/bzr/bzr.dev/revision/5939.2.2?remember=6217">(5939.2.2 767307-merge-force-doc)
Revision ID: pqm@pqm.ubuntu.com-20110601091513-vo5m9202wr24rbsl

(jameinel) Bug #767307,
improve the merge --force documentation. (Neil Martinsen-Burrell)

added added

removed removed