comparison hgmerge @ 431:dfc44f3f587c

convert-repo fixups -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 convert-repo fixups - - deal with octopus merge uniqueify parent list add a series of identical commits with "(octopus merge fixup)" - - add "committer" field from git to the commit message manifest hash: e33d802afe35edecfc5cc9b567def6db2b0cb885 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCubogywK+sNU5EO8RAkWgAJ9OVHeumKd/nRIfvS/nQ9eSbORqNgCgpBIE Dza0L59OSJHHmm3Dbp7ygds= =OEvJ -----END PGP SIGNATURE-----
author mpm@selenic.com
date Wed, 22 Jun 2005 11:21:04 -0800
parents f06a4a3b86a7
children 3d4d5f2aba9a 4fc63e22b1fe
comparison
equal deleted inserted replaced
430:5b22029b5aa2 431:dfc44f3f587c