/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/solo_intro.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/solo_intro.txt
5
5
----------------------------
6
6
 
7
7
Some tools are designed to make individuals productive (e.g. editors)
8
 
while other tools (e.g. back-end services) are focused on making teams
 
8
while other tools (e.g. back-end services) are focussed on making teams
9
9
or whole companies more productive. Version control tools have
10
10
traditionally been in the latter camp.
11
11