changeset 4361 | 46280c004f22 |
parent 3853 | c0b449154a90 |
child 4385 | 93a4e72b4f83 |
--- a/tests/test-merge7 +++ b/tests/test-merge7 @@ -35,7 +35,7 @@ hg commit -m "2 -> 2.5" -d "1000000 0" # now pull and merge from test-a hg pull ../test-a -HGMERGE=merge hg merge +hg merge # resolve conflict cat >test.txt <<"EOF" one @@ -57,7 +57,7 @@ hg commit -m "two -> two-point-one" -d " # pull and merge from test-a again cd ../test-b hg pull ../test-a -HGMERGE=merge hg merge --debug +hg merge --debug cat test.txt | sed "s% .*%%"