/brz/remove-bazaar : revision 4597.5.2

Committer: Vincent Ladeuil
Date: 2009-12-23 16:02:27 UTC
mto: <a title="Merged In 4597.3.46" href="/bzr/brz/remove-bazaar/revision/4597.3.46?remember=5200.3.2">(4597.3.46 description)
mto: This revision was merged to the branch mainline in revision 5009 .
Revision ID: v.ladeuil+lp@free.fr-20091223160227-g74kl2zokg92zsmk

To get this branch, use:

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

doc/es/user-guide/resolving_conflicts.txt is really the translation of
bzrlib/help-topics/en/conflicts.txt.

files renamed:
doc/es/user-guide/resolving_conflicts.txt => bzrlib/help_topics/es/conflicts.txt

added added

removed removed