Viewing all changes in revision 4929.1.1.
- Committer: Vincent Ladeuil
- Date: 2010-01-04 17:14:56 UTC
- mfrom: (4597.2.18 cleanup)
- mto: This revision was merged to the branch mainline in revision 4930.
- Revision ID: v.ladeuil+lp@free.fr-20100104171456-7ko1aczmbw9t8rm1
Cleanup conflicts docs
- files added:
- bzrlib/help_topics/es
- files renamed:
- doc/es/user-guide/resolving_conflicts.txt => bzrlib/help_topics/es/conflicts.txt
- files modified:
- bzrlib/conflicts.py
expand all
collapse all
added
removed
