← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to doc/es/user-guide/index-plain.txt

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-03-02 08:49:07 UTC
  • mfrom: (5067.1.1 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20100302084907-z4r0yoa4ldspjz82
(vila) Resolve --take-this or --take-other correctly rename kept file

Show diffs side-by-side

added added

removed removed

Lines of Context:
doc/es/user-guide/index-plain.txt
50
50
.. include later - partner_intro.txt
51
51
.. include later - branching_a_project.txt
52
52
.. include later - merging_changes.txt
53
 
.. include:: resolving_conflicts.txt
 
53
.. include later - resolving_conflicts.txt
54
54
.. include later - annotating_changes.txt
55
55
 
56
56
 
100
100
.. include later - server.txt
101
101
.. include later - hooks.txt
102
102
.. include:: version_info.txt
103
 
 
 
103
 
104
104
 
105
105
Apéndice
106
106
########