Viewing all changes in revision 4597.2.16.
- Committer: Vincent Ladeuil
- Date: 2010-01-04 14:30:17 UTC
- mto: (4597.11.1 537956-parent-loop-incomplete) (4929.1.1 integration) (5112.1.1 integration) (5113.1.1 integration) (5114.1.1 various) (5401.1.1 integration) (5067.1.1 integration)
- mto: This revision was merged to the branch mainline in revision 4930.
- Revision ID: v.ladeuil+lp@free.fr-20100104143017-atb9hcn7i4ryc51a
Put the spanish conflict help topic in the right place
- 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
