← Back to branch summary

~jelmer/brz/bundle-git-plugin

« back to all changes in this revision

Viewing changes to breezy/plugins/changelog_merge/tests/test_changelog_merge.py

  • Committer: Jelmer Vernooij
  • Date: 2018-03-25 00:39:16 UTC
  • mfrom: (6926 work)
  • mto: This revision was merged to the branch mainline in revision 6928.
  • Revision ID: jelmer@jelmer.uk-20180325003916-mqa5uj4uq55hrjq9
merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/changelog_merge/tests/test_changelog_merge.py
191
191
        # won't write the new value to disk where get_user_option can get it).
192
192
        merger.this_branch.get_config().set_user_option(
193
193
            'changelog_merge_files', 'ChangeLog')
194
 
        merge_hook_params = merge.MergeFileHookParams(merger, 'clog-id', None,
195
 
            'file', 'file', 'conflict')
 
194
        merge_hook_params = merge.MergeFileHookParams(merger, 'clog-id',
 
195
                ['ChangeLog', 'ChangeLog', 'ChangeLog'], None,
 
196
                'file', 'file', 'conflict')
196
197
        changelog_merger = changelog_merge.ChangeLogMerger(merger)
197
198
        return changelog_merger, merge_hook_params
198
199