← 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: Patch Queue Manager
  • Date: 2011-12-20 23:27:24 UTC
  • mfrom: (6391.1.2 small-fixes)
  • Revision ID: pqm@pqm.ubuntu.com-20111220232724-wje5zrxmccnqhsph
(gz) Small fix to plugin docstring and formatting (Benjamin Peterson)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/plugins/news_merge/news_merge.py
30
30
 
31
31
    def merge_text(self, params):
32
32
        """Perform a simple 3-way merge of a bzr NEWS file.
33
 
        
 
33
 
34
34
        Each section of a bzr NEWS file is essentially an ordered set of bullet
35
35
        points, so we can simply take a set of bullet points, determine which
36
36
        bullets to add and which to remove, sort, and reserialize.