~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to doc/index.txt

  • Committer: Martin Pool
  • Date: 2005-04-15 02:34:07 UTC
  • Revision ID: mbp@sourcefrog.net-20050415023407-986a296162e726d7
- Take email from ~/.bzr.conf/email

Show diffs side-by-side

added added

removed removed

Lines of Context:
73
73
 
74
74
* `Config specs <config-specs.html>`__ assemble a tree from several places.
75
75
 
76
 
* `Conflicts <conflicts.html>`_ that can occur during merge-like operations.
 
76
* `Conflicts <conflicts.html>`_ that can occur during merge-like
 
77
  operations.
 
78
 
 
79
* `Ignored files <ignore.html>`__
77
80
 
78
81
* `Recovering from interrupted operations <interrupted.html>`__
79
82