Viewing all changes in revision 4597.3.1.

Committer: Vincent Ladeuil
Date: 2009-08-13 06:21:35 UTC
mto: <a title="Merged In 4597.3.66" href="/~bzr-pqm/bzr/bzr.dev/revision/4597.3.66?remember=1185.11.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=1185.11.1">(5008.1.1 integration)
mto: This revision was merged to the branch mainline in revision 5009 .
Revision ID: v.ladeuil+lp@free.fr-20090813062135-mvkhie71vei48lco

First draft describing the different conflicts and some ways to resolve them.

added added

removed removed