Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-flags.out @ 705:574869103985
Merge with TAH
manifest hash: 197e0d1a0d7376a9eb72381330462f06490ab821
author | mpm@selenic.com |
---|---|
date | Thu, 14 Jul 2005 22:56:55 -0800 |
parents | d96c1153b25d b266e92bcd0b |
children | 7e4843b7efd2 |
line wrap: on
line diff
--- a/tests/test-flags.out +++ b/tests/test-flags.out @@ -52,19 +52,16 @@ 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