/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: Martin Pool
  • Date: 2008-06-03 06:55:59 UTC
  • mfrom: (3464.1.1 prepare-1.6beta1)
  • mto: This revision was merged to the branch mainline in revision 3468.
  • Revision ID: mbp@sourcefrog.net-20080603065559-6memzjge3lyy27o3
Merge back 1.6beta1

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.