~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_merger.py

• browse files at revision 6217
• compare with another revision
• download diff
• download tarball
• view history from revision 6217

• reverse the comparison (6217 to 5362.1.1)
• stop comparing with revision 5362.1.1

Show diffs side-by-side

added

removed

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,

• Older »

Loggerhead is a web-based interface for Breezy
Version: 2.0.1