← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/plugins/news_merge/news_merge.py

  • Committer: Robert Collins
  • Date: 2010-01-28 18:05:44 UTC
  • mto: (4797.2.5 2.1)
  • mto: This revision was merged to the branch mainline in revision 4989.
  • Revision ID: robertc@robertcollins.net-20100128180544-6l8x7o7obaq7b51x
Tweak ConfigurableFileMerger to use class variables rather than requiring __init__ wrapping as future proofing for helper functions.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/plugins/news_merge/news_merge.py
27
27
class NewsMerger(merge.ConfigurableFileMerger):
28
28
    """Merge bzr NEWS files."""
29
29
 
30
 
    def __init__(self, merger):
31
 
        super(NewsMerger, self).__init__(merger, 'news')
 
30
    name_prefix = "news"
32
31
 
33
32
    def merge_text(self, params):
34
33
        """Perform a simple 3-way merge of a bzr NEWS file.