/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_merger.py

  • Committer: Jelmer Vernooij
  • Date: 2011-04-16 08:42:21 UTC
  • mfrom: (5777.6.11 commit-lossy)
  • mto: This revision was merged to the branch mainline in revision 5792.
  • Revision ID: jelmer@samba.org-20110416084221-g9kgp1j4o9zo0kk4
merge commit-lossy

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_merger.py
1
 
# Copyright (C) 2009, 2010 Canonical Ltd
 
1
# Copyright (C) 2009, 2010, 2011 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
23
23
    errors,
24
24
    merge as _mod_merge,
25
25
    option,
26
 
    progress,
27
26
    )
28
27
from bzrlib.tests import (
29
28
    multiply_tests,