Mercurial > hg > pyhgsh
diff tests/test-merge7 @ 2283:e506c14382fd
deprecate 'update -m'. use 'merge' instead.
author | Vadim Gelfer <vadim.gelfer@gmail.com> |
---|---|
date | Sun, 14 May 2006 21:07:34 -0700 |
parents | 7544700fd931 |
children |
line wrap: on
line diff
--- a/tests/test-merge7 Sun May 14 17:37:34 2006 -0700 +++ b/tests/test-merge7 Sun May 14 21:07:34 2006 -0700 @@ -35,7 +35,7 @@ # now pull and merge from test-a hg pull ../test-a -HGMERGE=merge hg update -m +HGMERGE=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 update --debug -m +HGMERGE=merge hg merge --debug cat test.txt | sed "s% .*%%"