/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: Daniel Watkins
  • Date: 2009-02-07 23:54:41 UTC
  • mto: (3993.1.1 ianc-integration)
  • mto: This revision was merged to the branch mainline in revision 3994.
  • Revision ID: daniel@daniel-watkins.co.uk-20090207235441-igbvmxlrs7nz966p
Changed from option type to helper function.

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.