← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to doc/en/whats-new/whats-new-in-2.4.txt

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2011-01-25 13:59:32 UTC
  • mfrom: (5321.1.119 mergetools)
  • Revision ID: pqm@pqm.ubuntu.com-20110125135932-0o8d07i3j1flp6ou
(vila) Added external merge tool management module,
 bzrlib.mergetools. (Gordon Tyler)

Show diffs side-by-side

added added

removed removed

Lines of Context:
doc/en/whats-new/whats-new-in-2.4.txt
16
16
2.1, 2.2 and 2.3, and can read and write repositories generated by all
17
17
previous versions.
18
18
 
 
19
External Merge Tools
 
20
********************
 
21
 
 
22
External merge tool configuration has been added to ``bzr`` core. The name
 
23
and commandline of one or more external merge tools can be defined in
 
24
bazaar.conf. See the help topic ``configuration`` for more details.
19
25
 
20
26
Further information
21
27
*******************