← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Martin Pool
  • Date: 2005-06-06 04:17:53 UTC
  • Revision ID: mbp@sourcefrog.net-20050606041753-abe590daf0d7f959
Updated merge patch from Aaron

This patch contains all the changes to merge that I'd like to get into
0.5, namely
* common ancestor BASE selection
* merge reports conflicts when they are encountered
* merge refuses to operate in working trees with changes
* introduces revert command to revert the working tree to the
last-committed state
* Adds some reasonable help text

Show diffs side-by-side

added added

removed removed

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