Mercurial > hg

annotate tkmerge @ 123:b93cc016eec9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hg history: don't print file list without -v switch
author mpm@selenic.com
date Fri, 20 May 2005 17:46:47 -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