Mercurial > hg > gitweb

comparison tests/test-merge1.out @ 430:5b22029b5aa2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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-----
author mpm@selenic.com
date Tue, 21 Jun 2005 21:07:08 -0800
parents 0e0d0670b2bc
children 7e4843b7efd2
comparison
equal deleted inserted replaced
429:688d03d6997a 430:5b22029b5aa2
49 + hg commit -t 'commit #2' -d '0 0' -u user 49 + hg commit -t 'commit #2' -d '0 0' -u user
50 + hg update 1 50 + hg update 1
51 + echo This is file c1 51 + echo This is file c1
52 + hg add c 52 + hg add c
53 + hg commit -t 'commit #3' -d '0 0' -u user 53 + hg commit -t 'commit #3' -d '0 0' -u user
54 + cat b
55 This is file b1
54 + echo This is file b22 56 + echo This is file b22
55 + env HGMERGE=../merge hg update -m 2 57 + env HGMERGE=../merge hg update -m 2
58 merging for b
59 merging b
56 + cd .. 60 + cd ..
57 + /bin/rm -rf t 61 + /bin/rm -rf t
58 + mkdir t 62 + mkdir t
59 + cd t 63 + cd t
60 + hg init 64 + hg init