← 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: Vincent Ladeuil
  • Date: 2017-01-17 13:48:10 UTC
  • mfrom: (6615.3.6 merges)
  • mto: This revision was merged to the branch mainline in revision 6620.
  • Revision ID: v.ladeuil+lp@free.fr-20170117134810-j9p3lidfy6pfyfsc
Merge 2.7, resolving conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
doc/en/user-guide/index.txt
97
97
 
98
98
   part2_intro
99
99
   adv_merging
 
100
   switch_store
100
101
   shelving_changes
101
102
   filtered_views
102
103
   stacked
103
104
   server
104
105
   hooks
105
106
   version_info
 
107
   gpg_signatures
106
108
 
107
109
 
108
110
A brief tour of some popular plugins
137
139
   setting_up_email
138
140
   http_smart_server
139
141
   writing_a_plugin
 
142
   licence
140
143
 
141
144
.. |--| unicode:: U+2014