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-----

     1

+ hg init

     2

+ echo This is file a1

     3

+ hg add a

     4

+ hg commit -t 'commit #0' -d '0 0' -u user

     5

+ touch b

     6

+ hg add b

     7

+ rm b

     8

+ hg commit -A '-tcomment #1' -d '0 0' -u user

     9

b never committed!