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