Replace tkmerge with hgmerge -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Replace tkmerge with hgmerge hgmerge attempts to find and use merge, kdiff3, tkmerge, and diff+patch. hg will use hgmerge unless overridden with HGMERGE manifest hash: 9137a620df4b235e66343b0fd0dba87fe631546e -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCoRGrywK+sNU5EO8RAi2VAJ9bh97ChGJymP/p8rvCuyNAMnk1bQCgrIGP vYI6qlyWKQZ01ObUTAIg92o= =+mRH -----END PGP SIGNATURE-----

     1

d40cc5aacc31ed673d9b5b24f98bee78c283062c 0.4f

     2

1c590d34bf61e2ea12c71738e5a746cd74586157 0.4e

     3

7eca4cfa8aad5fce9a04f7d8acadcd0452e2f34e 0.4d

     4

b4d0c3786ad3e47beacf8412157326a32b6d25a4 0.4c

     5

f40273b0ad7b3a6d3012fd37736d0611f41ecf54 0.5

     6

0a28dfe59f8fab54a5118c5be4f40da34a53cdb7 0.5b