tkmerge
author mpm@selenic.com
Fri, 20 May 2005 17:35:20 -0800
changeset 116 e484cd5ec282
parent 0 9117c6561b0b
permissions -rw-r--r--
Only use lazy indexing for big indices and avoid the overhead of the lazy index in the small index case.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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