/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

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

  • Committer: Jelmer Vernooij
  • Date: 2018-11-16 23:19:12 UTC
  • mfrom: (7180 work)
  • mto: This revision was merged to the branch mainline in revision 7294.
  • Revision ID: jelmer@jelmer.uk-20181116231912-e043vpq22bdkxa6q
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/news_merge/news_merge.py
42
42
        other_lines = list(simple_parse_lines(params.other_lines))
43
43
        base_lines = list(simple_parse_lines(params.base_lines))
44
44
        m3 = merge3.Merge3(base_lines, this_lines, other_lines,
45
 
            allow_objects=True)
 
45
                           allow_objects=True)
46
46
        result_chunks = []
47
47
        for group in m3.merge_groups():
48
48
            if group[0] == 'conflict':