changeset 4365 | 46280c004f22 |
parent 3853 | c0b449154a90 |
child 4387 | 93a4e72b4f83 |
--- a/tests/test-merge7 Mon Apr 16 20:17:39 2007 -0300 +++ b/tests/test-merge7 Mon Apr 16 20:17:39 2007 -0300 @@ -35,7 +35,7 @@ # 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 @@ # 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% .*%%"