Viewing all changes in revision 4597.5.2.
- Committer: Vincent Ladeuil
- Date: 2009-12-23 16:02:27 UTC
- mto: (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
doc/es/user-guide/resolving_conflicts.txt is really the translation of
bzrlib/help-topics/en/conflicts.txt.
bzrlib/help-topics/en/conflicts.txt.
- files added:
- bzrlib/help_topics/es
- files renamed:
- doc/es/user-guide/resolving_conflicts.txt => bzrlib/help_topics/es/conflicts.txt
expand all
collapse all
added
removed
