~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/plugins/po_merge/README

  • Committer: Martin Pool
  • Date: 2005-06-28 07:08:58 UTC
  • mto: This revision was merged to the branch mainline in revision 852.
  • Revision ID: mbp@sourcefrog.net-20050628070858-6c2a057c77ed9a14
More tests for nested insert instructions

Show diffs side-by-side

added added

removed removed

Lines of Context:
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.