Viewing all changes in revision 4843.

Committer: Canonical.com Patch Queue Manager
Date: 2009-12-01 00:10:04 UTC
mfrom: <a title="Merged From 4798.6.3" href="/~bzr-pqm/bzr/bzr.dev/revision/4798.6.3?remember=5452">(4798.6.3 fix-190096)
Revision ID: pqm@pqm.ubuntu.com-20091201001004-vflb5bqsnrlkfh7p

Including a discussion of revert --forget-merges as a tool for
advanced merging. (Neil Martinsen-Burrell, #190096)

added added

removed removed