##// END OF EJS Templates
Replace tkmerge with hgmerge...
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-----
mpm@selenic.com -
r240:737c66b6 default
Show More
Name Size Modified Last Commit Author
/ mercurial
__init__.py Loading ...
byterange.py Loading ...
commands.py Loading ...
fancyopts.py Loading ...
hg.py Loading ...
hgweb.py Loading ...
lock.py Loading ...
mdiff.py Loading ...
mpatch.c Loading ...
revlog.py Loading ...
transaction.py Loading ...
ui.py Loading ...