Mercurial > hg > mercurial-crew-with-dirclash

annotate tkmerge @ 96:fce47326677c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add updated merge3 code
author mpm@selenic.com
date Wed, 18 May 2005 16:45:44 -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