Mercurial > hg > mercurial-crew-with-dirclash

annotate tkmerge @ 186:9a2075c0b9b8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add $HGEDITOR hook and example script -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Add $HGEDITOR hook and example script This hook makes signing commits easier. manifest hash: ba8723e4b52323528dfa681a58658a5b4b2c02e4 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCmONFywK+sNU5EO8RAj87AKCEa5r9EepdYPiYRGo/jAjjwCIcVACfeBPe QDInXr7karo6/P8d2bM/tVU= =rxIQ -----END PGP SIGNATURE-----
author mpm@selenic.com
date Sat, 28 May 2005 13:31:49 -0800
parents 9117c6561b0b
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
1 merge $1 $3 $2 || tkdiff -conflict $1 -o $1
9117c6561b0b Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff changeset
2