← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to doc/index.txt

  • Committer: Aaron Bentley
  • Date: 2007-07-24 21:24:55 UTC
  • mto: (1551.19.24 Aaron's mergeable stuff)
  • mto: This revision was merged to the branch mainline in revision 2652.
  • Revision ID: abentley@panoramicfeedback.com-20070724212455-g5lfvmfrulnzu0ki
Update from review

Show diffs side-by-side

added added

removed removed

Lines of Context:
doc/index.txt
29
29
 
30
30
* `Conflict handling <conflicts.htm>`_
31
31
 
 
32
    The various kind of conflicts you may encounter, and how to handle them.
 
33
 
32
34
* `Plugins <plugins.htm>`_
33
35
  (wiki page: http://bazaar-vcs.org/BzrPlugins)
34
36