~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_merge3.py

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

• reverse the comparison (6093.4.163 to 5439.1.1)
• stop comparing with revision 5439.1.1

Show diffs side-by-side

added

removed

bzrlib/tests/test_merge3.py

1

 

# Copyright (C) 2005-2010 Canonical Ltd

 

1

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

16

16

 

17

17

 

18

18

from bzrlib import (

19

 

    errors,

20

19

    merge3,

21

20

    tests,

22

21

    )

23

 

from bzrlib.merge3 import Merge3

24

22

from bzrlib.errors import CantReprocessAndShowBase, BinaryFile

25

23

 

26

24

def split_lines(t):

• Older »

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