← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/plugins/po_merge/README

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-03-25 00:02:51 UTC
  • mfrom: (5106.1.1 version-bump)
  • Revision ID: pqm@pqm.ubuntu.com-20100325000251-bwsv5c5d3l9x3lnn
(Jelmer) Bump API version for 2.2.0.

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.