← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to doc/en/admin-guide/integration.txt

  • Committer: Martin Pool
  • Date: 2006-03-24 19:11:33 UTC
  • mto: This revision was merged to the branch mainline in revision 1626.
  • Revision ID: mbp@sourcefrog.net-20060324191133-4f45292db5c5d487
(weave-merge) don't treat killed-both lines as points of agreement; 
makes sure that killed-[ab] lines next to change reasons aren't 
omitted from conflict descriptions.

Add more weave merge tests about line deletion.

Show diffs side-by-side

added added

removed removed

Lines of Context:
doc/en/admin-guide/integration.txt
1
 
Integration with Other Tools
2
 
============================
3
 
 
4
 
Patch Queue Manager (PQM)
5
 
-------------------------
6
 
 
7
 
Bug Trackers
8
 
------------
9
 
 
10
 
Continuous Integration Tools
11
 
----------------------------
12
 
 
13
 
Bundle Buggy
14
 
------------