/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/po_merge/README

  • Committer: Vincent Ladeuil
  • Date: 2012-01-19 17:14:27 UTC
  • mto: (6437.3.18 2.5)
  • mto: This revision was merged to the branch mainline in revision 6444.
  • Revision ID: v.ladeuil+lp@free.fr-20120119171427-xhxthhw3mtz35hpf
The https test server will now refuse connections if an ssl error occurs during the handshake. Ssl errors and certificate errors aborts requests without re-trying them.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/plugins/po_merge/README
 
1
A plugin for merging .po files.
 
2
 
 
3
This plugin is controlled via configuration variables, see 'bzr help po_merge'.
 
4
 
 
5
This hook can avoid conflicts in ``.po` files by invoking msgmerge with the
 
6
appropriate options. If it can't apply, it falls back to the default bzr
 
7
merge algorithm.