Viewing all changes in revision 4597.3.50.

Committer: Vincent Ladeuil
Date: 2009-12-24 11:32:30 UTC
mto: <a title="Merged In 4597.3.66" href="/~bzr-pqm/bzr/bzr.dev/revision/4597.3.66?remember=734">(4597.3.66 dont-add-conflict-helpers) <a title="Merged In 5008.1.1" href="/~bzr-pqm/bzr/bzr.dev/revision/5008.1.1?remember=734">(5008.1.1 integration)
mto: This revision was merged to the branch mainline in revision 5009 .
Revision ID: v.ladeuil+lp@free.fr-20091224113230-mip33ug63enjbuns

Integrate most of BRANCH.TOTO into bzrlib/help_topics/en/conflicts.txt, fix a typo in a test.

added added

removed removed