~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_merge3.py

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

• reverse the comparison (5546.1.1 to 6170)
• stop comparing with revision 6170

Show diffs side-by-side

added

removed

bzrlib/tests/test_merge3.py

1

 

# Copyright (C) 2005-2011 Canonical Ltd

 

1

# Copyright (C) 2005-2010 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

16

16

 

17

17

 

18

18

from bzrlib import (

 

19

    errors,

19

20

    merge3,

20

21

    tests,

21

22

    )

 

23

from bzrlib.merge3 import Merge3

22

24

from bzrlib.errors import CantReprocessAndShowBase, BinaryFile

23

25

 

24

26

def split_lines(t):

• Older »

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