← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to doc/en/user-guide/index.txt

  • Committer: Ian Clatworthy
  • Date: 2007-11-21 02:54:47 UTC
  • mto: (3054.1.1 ianc-integration)
  • mto: This revision was merged to the branch mainline in revision 3055.
  • Revision ID: ian.clatworthy@internode.on.net-20071121025447-nhk6gpbi273neulr
add conflict handling as an Appendix + minor tweaks

Show diffs side-by-side

added added

removed removed

Lines of Context:
doc/en/user-guide/index.txt
90
90
##########
91
91
 
92
92
.. include:: specifying_revisions.txt
 
93
.. include:: conflicts.txt
93
94
.. include:: setting_up_email.txt
94
95
.. include:: authentication_conf.txt
95
96
.. include:: http_smart_server.txt