/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

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

  • Committer: John Arbash Meinel
  • Date: 2008-07-09 21:42:24 UTC
  • mto: This revision was merged to the branch mainline in revision 3543.
  • Revision ID: john@arbash-meinel.com-20080709214224-r75k87r6a01pfc3h
Restore a real weave merge to 'bzr merge --weave'.

To do so efficiently, we only add the simple LCAs to the final weave
object, unless we run into complexities with the merge graph.
This gives the same effective result as adding all the texts,
with the advantage of not having to extract all of them.

Show diffs side-by-side

added added

removed removed

Lines of Context:
doc/en/user-guide/controlling_registration.txt
100
100
 
101
101
.. [#] On Windows, the users configuration files can be found in the
102
102
   application data directory. So instead of ``~/.bazaar/branch.conf``
103
 
   the configuration file can be found as:
 
103
   the configuration file can be found as: 
104
104
   ``C:\Documents and Settings\<username>\Application Data\Bazaar\2.0\branch.conf``.
105
105
   The same is true for ``locations.conf``, ``ignore``, and the
106
106
   ``plugins`` directory.