Mercurial > hg > mercurial-crew-with-dirclash
comparison hgmerge @ 301:5add718d92db
revlog: allow duplicates
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
revlog: allow duplicates
If two branches make the same change to the same parent, the result
will be an identical hash. Git apparently does this all the time. Deal
with it gracefully.
manifest hash: c6217eab4b310e1ae529dd75ab90e717dbe5d55d
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCqU61ywK+sNU5EO8RAkFqAJ9KhWUQgjZbzzB/+mTkolH0GkT1awCfa+Mj
ulbI4xCRZcvfQE492mcNwQA=
=N6In
-----END PGP SIGNATURE-----
author | mpm@selenic.com |
---|---|
date | Fri, 10 Jun 2005 00:26:29 -0800 |
parents | a69c3b2957d1 |
children | 15a9e55e7ea5 f06a4a3b86a7 |
comparison
equal
deleted
inserted
replaced
300:d3400605d246 | 301:5add718d92db |
---|