~bzr-pqm/bzr/bzr.dev

Committer: Patch Queue Manager
Date: 2011-11-29 10:47:47 UTC
mfrom: (6282.3.13 884270-merge-po)
Revision ID: pqm@pqm.ubuntu.com-20111129104747-32qen0v8yxbxeoov

(vila) Smarter .po file merging with merge hook as a plugin: po_merge.
(Vincent Ladeuil)

added added

removed removed

A plugin for merging .po files.

This plugin is controlled via configuration variables, see 'bzr help po_merge'.

This hook can avoid conflicts in ``.po` files by invoking msgmerge with the

appropriate options. If it can't apply, it falls back to the default bzr

merge algorithm.