Mercurial > hg > mercurial-crew-with-dirclash

annotate tkmerge @ 121:66fb61d9d97d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use revlog.delta and mdiff.patchtext to massively speed up processing of manifests. This lets us verify a 28k changeset kernel repo in under two minutes.
author mpm@selenic.com
date Fri, 20 May 2005 17:44:34 -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