Viewing all changes in revision 4930.
- Committer: Canonical.com Patch Queue Manager
- Date: 2010-01-04 17:56:49 UTC
- mfrom: (4929.1.1 integration)
- Revision ID: pqm@pqm.ubuntu.com-20100104175649-lb0fpgzbuyu91ltv
(vila) 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
