/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: Mark Hammond
  • Date: 2008-08-12 13:07:00 UTC
  • mto: (3691.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 3692.
  • Revision ID: mhammond@skippinet.com.au-20080812130700-05ohg06353nxg22q
eagerly unlock the result_basis to prevent handles staying open.

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.