← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Vincent Ladeuil
  • Date: 2012-02-14 17:22:37 UTC
  • mfrom: (6466 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6468.
  • Revision ID: v.ladeuil+lp@free.fr-20120214172237-7dv7er3n4uy8d5m4
Merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/plugins/changelog_merge/tests/test_changelog_merge.py
186
186
            base_text, True)
187
187
        builder.change_contents('clog-id', other=other_text, this=this_text)
188
188
        merger = builder.make_merger(merge.Merge3Merger, ['clog-id'])
189
 
        merger.this_branch.get_config().set_user_option(
 
189
        merger.this_branch.get_config_stack().set(
190
190
            'changelog_merge_files', 'ChangeLog')
191
191
        merge_hook_params = merge.MergeFileHookParams(merger, 'clog-id', None,
192
192
            'file', 'file', 'conflict')