← 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: 2011-08-17 18:13:57 UTC
  • mfrom: (5268.7.29 transport-segments)
  • Revision ID: pqm@pqm.ubuntu.com-20110817181357-y5q5eth1hk8bl3om
(jelmer) Allow specifying the colocated branch to use in the branch URL,
 and retrieving the branch name using ControlDir._get_selected_branch.
 (Jelmer Vernooij)

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.