Rev 4666: Merge cleanup into description in file:///home/vila/src/bzr/experimental/conflict-manager/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/experimental/conflict-manager/

------------------------------------------------------------
revno: 4666 [merge]
revision-id: v.ladeuil+lp at free.fr-20100116101010-yvfufbw49pg3dnyu
parent: v.ladeuil+lp at free.fr-20100116100621-bd1a825l980jgwzm
parent: v.ladeuil+lp at free.fr-20100116101002-7v0veajsauph4uho
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: description
timestamp: Sat 2010-01-16 11:10:10 +0100
message:
  Merge cleanup into description
renamed:
  bzrlib/help_topics/es/conflicts.txt => bzrlib/help_topics/es/conflict-types.txt conflicts.txt-20080504181626-aqnzjwfhpju5ypfe-1
-------------- next part --------------
=== renamed file 'bzrlib/help_topics/es/conflicts.txt' => 'bzrlib/help_topics/es/conflict-types.txt'