/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: Vincent Ladeuil
  • Date: 2009-11-18 16:02:53 UTC
  • mto: This revision was merged to the branch mainline in revision 4808.
  • Revision ID: v.ladeuil+lp@free.fr-20091118160253-11zt6hr4luwpw0ur
Fix babune failures, most probably due to jam's fix for the http slowness on windows.

* test_http.py:
(TestProxyHttpServer.setUp): When in doubt, refuse the temptation
to guess, the test server will set its host in whatever way it see
fit, so use that.

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.