187
187
builder.change_contents('clog-id', other=other_text, this=this_text)
188
188
merger = builder.make_merger(merge.Merge3Merger, ['clog-id'])
189
192
merger.this_branch.get_config().set_user_option(
190
193
'changelog_merge_files', 'ChangeLog')
191
merge_hook_params = merge.MergeHookParams(merger, 'clog-id', None,
194
merge_hook_params = merge.MergeFileHookParams(merger, 'clog-id', None,
192
195
'file', 'file', 'conflict')
193
196
changelog_merger = changelog_merge.ChangeLogMerger(merger)
194
197
return changelog_merger, merge_hook_params