Viewing all changes in revision 4597.3.46.
- Committer: Vincent Ladeuil
- Date: 2009-12-23 16:04:24 UTC
- mfrom: (4597.5.2 cleanup)
- mto: (4597.3.66 dont-add-conflict-helpers) (5008.1.1 integration)
- mto: This revision was merged to the branch mainline in revision 5009.
- Revision ID: v.ladeuil+lp@free.fr-20091223160424-x3fvut12746262h2
Merge cleanup into description
- 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
