Mercurial > hg > mercurial-crew-with-dirclash

annotate tkmerge @ 134:13d609f8d830

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix problem with non wrapping file list fix file list not appearing in checkin
author jake@edge2.net
date Sat, 21 May 2005 16:21:16 -0700
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