Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-up-local-change.out @ 374:f07d00fcd281
update tests to reflect new short hash length
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
update tests to reflect new short hash length
manifest hash: 7ae99e74333416e8cbf8bc5d518bb5d3c449788b
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCsQo8ywK+sNU5EO8RAltAAJ97yqgcTU0eYrQ2vpIq+hrfCfrsVwCggUk4
adIvEe7OzGeG6wn0/aRoQXY=
=h8+W
-----END PGP SIGNATURE-----
author | mpm@selenic.com |
---|---|
date | Wed, 15 Jun 2005 21:12:28 -0800 |
parents | b4e0e20646bb |
children | e5d769afd3ef |
line wrap: on
line diff
--- a/tests/test-up-local-change.out +++ b/tests/test-up-local-change.out @@ -28,16 +28,16 @@ C a + hg -d up resolving manifests - ancestor a0c8bcbb local a0c8bcbb remote 1165e8bd + ancestor a0c8bcbbb45c local a0c8bcbbb45c remote 1165e8bd193e a versions differ, resolve remote created b getting b merging a resolving a -file a: other d730145a ancestor b789fdd9 +file a: other d730145abbf9 ancestor b789fdd96dc2 + hg -d up -m resolving manifests - ancestor 1165e8bd local 1165e8bd remote 1165e8bd + ancestor 1165e8bd193e local 1165e8bd193e remote 1165e8bd193e + hg parents changeset: 1:1e71731e6fbb5b35fae293120dea6964371c13c6 user: test