← 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: Aaron Bentley
  • Date: 2010-01-20 07:27:49 UTC
  • mto: This revision was merged to the branch mainline in revision 5049.
  • Revision ID: aaron@aaronbentley.com-20100120072749-kb2r2shencwhekkd
It makes more sense to get the dev focus from an existing Launchpad branch
object, especially given that you need a Launchpad branch object to get it.

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.