Mercurial > hg

diff tests/test-flags @ 440:22b5aaeb3637

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix up tests for command name changes -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Fix up tests for command name changes manifest hash: 04b04d0b2ca96f29b3b9a52e4ed8478ee7e2761f -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuvDTywK+sNU5EO8RAnKzAJ9JSRUsVy/kHp3CweXpsJiu+fXCKQCgq0Pt OOUKYPj6aJOvxB+Zz17X8dg= =EyYE -----END PGP SIGNATURE-----
author mpm@selenic.com
date Thu, 23 Jun 2005 09:26:43 -0800
parents 291a62848f54
children 66eb9905d0a2 e94cebc60d96
line wrap: on
line diff
--- a/tests/test-flags	Thu Jun 23 09:22:30 2005 -0800
+++ b/tests/test-flags	Thu Jun 23 09:26:43 2005 -0800
@@ -13,7 +13,7 @@
 cd test2
 
 hg init
-hg merge ../test1
+hg pull ../test1
 hg co
 chmod +x a
 hg ci -t "chmod +x a" -u test -d "0 0"
@@ -22,7 +22,7 @@
 echo 123 >>a
 hg ci -t "a updated" -u test -d "0 0"
 
-hg merge ../test2
+hg pull ../test2
 hg heads
 hg history