equal
deleted
inserted
replaced
34 base, a, b) |
34 base, a, b) |
35 |
35 |
36 CantReprocessAndShowBase = simplemerge.CantReprocessAndShowBase |
36 CantReprocessAndShowBase = simplemerge.CantReprocessAndShowBase |
37 |
37 |
38 def split_lines(t): |
38 def split_lines(t): |
39 from cStringIO import StringIO |
39 return util.stringio(t).readlines() |
40 return StringIO(t).readlines() |
|
41 |
40 |
42 ############################################################ |
41 ############################################################ |
43 # test case data from the gnu diffutils manual |
42 # test case data from the gnu diffutils manual |
44 # common base |
43 # common base |
45 TZU = split_lines(""" The Nameless is the origin of Heaven and Earth; |
44 TZU = split_lines(""" The Nameless is the origin of Heaven and Earth; |