comparison tests/test-flags.out @ 619:d96c1153b25d

update tests -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 update tests manifest hash: 70079385599132ca8f90582e1f9317ca46167532 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCyaISywK+sNU5EO8RApnGAJ0blIxE0tKPzcRQUDAHCLe5KmUSNgCgjGoA kV4Os9FG1NmGaCysPIsKwts= =Ee67 -----END PGP SIGNATURE-----
author Matt Mackall <mpm@selenic.com>
date Mon, 04 Jul 2005 12:54:42 -0800
parents eb46971fc57f
children b266e92bcd0b 574869103985
comparison
equal deleted inserted replaced
618:4051b78c53c7 619:d96c1153b25d
50 parent: 0:22a449e20da501ca558394c083ca470e9c81b9f7 50 parent: 0:22a449e20da501ca558394c083ca470e9c81b9f7
51 user: test 51 user: test
52 date: Thu Jan 1 00:00:00 1970 52 date: Thu Jan 1 00:00:00 1970
53 summary: chmod +x a 53 summary: chmod +x a
54 54
55
55 changeset: 1:c6ecefc45368ed556d965f1c1086c6561a8b2ac5 56 changeset: 1:c6ecefc45368ed556d965f1c1086c6561a8b2ac5
56 user: test 57 user: test
57 date: Thu Jan 1 00:00:00 1970 58 date: Thu Jan 1 00:00:00 1970
58 summary: a updated 59 summary: a updated
59 60
61
60 changeset: 0:22a449e20da501ca558394c083ca470e9c81b9f7 62 changeset: 0:22a449e20da501ca558394c083ca470e9c81b9f7
61 user: test 63 user: test
62 date: Thu Jan 1 00:00:00 1970 64 date: Thu Jan 1 00:00:00 1970
63 summary: added a b 65 summary: added a b
66
64 67
65 + hg -v co -m 68 + hg -v co -m
66 resolving manifests 69 resolving manifests
67 merging a 70 merging a
68 resolving a 71 resolving a