~bzr-pqm/bzr/bzr.dev

6282.3.1 by Vincent Ladeuil
First cut at a working plugin to avoid conflicts in .po files by shelling out to msgmerge.
1
A plugin for merging .po files.
2
6282.3.12 by Vincent Ladeuil
Better fix README, add 'debian/po' to the 'po_merge.po_dirs' default value.
3
This plugin is controlled via configuration variables, see 'bzr help po_merge'.
6282.3.1 by Vincent Ladeuil
First cut at a working plugin to avoid conflicts in .po files by shelling out to msgmerge.
4
5
This hook can avoid conflicts in ``.po` files by invoking msgmerge with the
6282.3.11 by Vincent Ladeuil
Fix README.
6
appropriate options. If it can't apply, it falls back to the default bzr
6282.3.1 by Vincent Ladeuil
First cut at a working plugin to avoid conflicts in .po files by shelling out to msgmerge.
7
merge algorithm.