Viewing all changes in revision 4597.3.27.

Committer: Vincent Ladeuil
Date: 2009-10-17 09:58:24 UTC
mto: <a title="Merged In 4597.3.66" href="/~bzr-pqm/bzr/bzr.dev/revision/4597.3.66?remember=5020.1.1">(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=5020.1.1">(5008.1.1 integration)
mto: This revision was merged to the branch mainline in revision 5009 .
Revision ID: v.ladeuil+lp@free.fr-20091017095824-51hxi0o8agj3w5de

(keep_mine, take_theirs) sounds clearer than (keep_this, keep_other).

added added

removed removed