← 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: Shannon Weyrick
  • Date: 2011-11-16 20:59:10 UTC
  • mto: This revision was merged to the branch mainline in revision 6268.
  • Revision ID: weyrick@mozek.us-20111116205910-1xbpqbimbw3fvfqw
A version of the patch, based on suggestions from John Meinel, which detects an empty page differently to avoid false positives.

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.