← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_merge_directive.py

  • Committer: Jelmer Vernooij
  • Date: 2011-12-16 19:18:39 UTC
  • mto: This revision was merged to the branch mainline in revision 6391.
  • Revision ID: jelmer@samba.org-20111216191839-eg681lxqibi1qxu1
Fix remaining tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge_directive.py
462
462
        time = 453
463
463
        timezone = 7200
464
464
        class FakeBranch(object):
465
 
            def get_config(self):
 
465
            def get_config_stack(self):
466
466
                return self
467
467
            def gpg_signing_command(self):
468
468
                return 'loopback'