← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/plugins/news_merge/README

  • Committer: Martin Pool
  • Date: 2005-07-28 11:56:24 UTC
  • Revision ID: mbp@sourcefrog.net-20050728115624-93c11c2b1e399023
- note changes to command line parsing

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.