Viewing all changes in revision 5193.

Committer: Canonical.com Patch Queue Manager
Date: 2010-04-29 07:30:11 UTC
mfrom: (5168.2.5 friendlier-merge-file-helper)
Revision ID: pqm@pqm.ubuntu.com-20100429073011-5f4kzm2wpojq9we1

(andrew) Add bzrlib.merge.PerFileMerger to make it easier to write
simple merge_file_content hooks.

added added

removed removed