/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: 2007-08-21 13:52:55 UTC
  • mto: (2767.1.1 bzr.ab.integration)
  • mto: This revision was merged to the branch mainline in revision 2768.
  • Revision ID: d.m.watkins@warwick.ac.uk-20070821135255-tgicf49ud4jr7fk4
Now use internal merging.

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.