← 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: Vincent Ladeuil
  • Date: 2010-11-07 13:38:56 UTC
  • mfrom: (5050.45.8 2.2)
  • mto: This revision was merged to the branch mainline in revision 5531.
  • Revision ID: v.ladeuil+lp@free.fr-20101107133856-21rzvgfl40q4wxhd
Merge 2.2 into trunk including fix for bug #646961

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.