← 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: Patch Queue Manager
  • Date: 2013-08-04 12:14:46 UTC
  • mfrom: (6584.1.1 trunk)
  • Revision ID: pqm@pqm.ubuntu.com-20130804121446-ld9wzuj43ep8q5h0
(vila) Merge 2.6 into trunk (Vincent Ladeuil)

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.