# HG changeset patch
# User mpm@selenic.com
# Date 1119416828 28800
# Node ID 5b22029b5aa254f1445fe766f20558131b502b94
# Parent  688d03d6997aba3212056a7959d0848c00f95c8d
Fix up test-merge1

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Fix up test-merge1

The third test was wrong and showed up after fixing the typo in
compare code

manifest hash: 306ab9936457ad90e7c7a226d6407ca586262650
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)

iD8DBQFCuPH8ywK+sNU5EO8RAql+AJsH/bxFMTMbUiaEoLNhXS6wNkzLAgCfQxDJ
3j5pZ3MzrtPD0y4wC3vIAA4=
=VKEy
-----END PGP SIGNATURE-----


diff -r 688d03d6997a -r 5b22029b5aa2 tests/test-merge1
--- a/tests/test-merge1	Tue Jun 21 21:04:49 2005 -0800
+++ b/tests/test-merge1	Tue Jun 21 21:07:08 2005 -0800
@@ -59,9 +59,10 @@
 echo This is file c1 > c
 hg add c
 hg commit -t "commit #3" -d "0 0" -u user
+cat b
 echo This is file b22 > b
 env HGMERGE=../merge hg update -m 2
-# no merges expected
+# merge expected!
 cd ..; /bin/rm -rf t
 
 mkdir t
diff -r 688d03d6997a -r 5b22029b5aa2 tests/test-merge1.out
--- a/tests/test-merge1.out	Tue Jun 21 21:04:49 2005 -0800
+++ b/tests/test-merge1.out	Tue Jun 21 21:07:08 2005 -0800
@@ -51,8 +51,12 @@
 + echo This is file c1
 + hg add c
 + hg commit -t 'commit #3' -d '0 0' -u user
++ cat b
+This is file b1
 + echo This is file b22
 + env HGMERGE=../merge hg update -m 2
+merging for b
+merging b
 + cd ..
 + /bin/rm -rf t
 + mkdir t