changeset 619 | d96c1153b25d |
parent 591 | eb46971fc57f |
child 696 | b266e92bcd0b |
child 705 | 574869103985 |
--- a/tests/test-flags.out +++ b/tests/test-flags.out @@ -52,16 +52,19 @@ user: test date: Thu Jan 1 00:00:00 1970 summary: chmod +x a + changeset: 1:c6ecefc45368ed556d965f1c1086c6561a8b2ac5 user: test date: Thu Jan 1 00:00:00 1970 summary: a updated + changeset: 0:22a449e20da501ca558394c083ca470e9c81b9f7 user: test date: Thu Jan 1 00:00:00 1970 summary: added a b + + hg -v co -m resolving manifests merging a