/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: Canonical.com Patch Queue Manager
  • Date: 2009-03-11 10:22:00 UTC
  • mfrom: (4100.1.5 trivial)
  • Revision ID: pqm@pqm.ubuntu.com-20090311102200-heffmfrrstw2fovy
(mbp) SSHSmartClientStreamMedium repr and better LockContention
        message

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.