← 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: Jelmer Vernooij
  • Date: 2012-07-06 11:27:16 UTC
  • mfrom: (6534 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6535.
  • Revision ID: jelmer@samba.org-20120706112716-jcun7vvbpgmcplgz
Merge bzr.dev.

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.