← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to doc/es/quick-reference/index.txt

  • Committer: Martin Pool
  • Date: 2006-03-24 19:11:33 UTC
  • mto: This revision was merged to the branch mainline in revision 1626.
  • Revision ID: mbp@sourcefrog.net-20060324191133-4f45292db5c5d487
(weave-merge) don't treat killed-both lines as points of agreement; 
makes sure that killed-[ab] lines next to change reasons aren't 
omitted from conflict descriptions.

Add more weave merge tests about line deletion.

Show diffs side-by-side

added added

removed removed

Lines of Context:
doc/es/quick-reference/index.txt
1
 
Referencia Rapida
2
 
=================
3
 
 
4
 
* `PDF format <../_static/es/bzr-es-quick-reference.pdf>`_
5
 
* `PNG format <../_static/es/bzr-es-quick-reference.png>`_
6
 
* `SVG format <../_static/es/bzr-es-quick-reference.svg>`_