/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 bzrlib/plugins/news_merge/README

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2006-09-05 13:41:59 UTC
  • mfrom: (1963.1.4 run-subprocess)
  • Revision ID: pqm@pqm.ubuntu.com-20060905134159-ac8e1b01ac29c518
(jam) run_bzr_subprocess can remove env vars

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/plugins/news_merge/README
1
 
A plugin for merging bzr's NEWS file.
2
 
 
3
 
This plugin is activated via configuration variables, see 'bzr help news_merge'.
4
 
 
5
 
This hook can resolve conflicts where both sides add entries at the same place.
6
 
If it encounters a more difficult conflict it gives up and bzr will fallback to
7
 
the default merge algorithm.