To get this branch, use:

bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

Viewing all changes in revision 5008.1.1.

Committer: Vincent Ladeuil
Date: 2010-02-05 10:57:26 UTC
mfrom: <a title="Merged From 4597.3.74" href="/bzr/brz/remove-bazaar/revision/4597.3.74?remember=5200.3.5">(4597.3.74 dont-add-conflict-helpers)
mto: This revision was merged to the branch mainline in revision 5009 .
Revision ID: v.ladeuil+lp@free.fr-20100205105726-i0t82c1yjwrgxgzp

Add --take-this and --take-other actions to bzr resolve

added added

removed removed