Mercurial
Mercurial
>
hg
>
mercurial-crew-with-dirclash
/ file revision
summary
|
shortlog
|
changelog
|
graph
|
tags
|
bookmarks
|
branches
|
files
|
changeset
| file |
latest
|
revisions
|
annotate
|
diff
|
comparison
|
raw
|
help
Find changesets by keywords (author, files, the commit message), revision number or hash, or
revset expression
.
tkmerge
author
mpm@selenic.com
Tue, 24 May 2005 23:11:44 -0800
changeset 147
b6d8ed7aeba0
parent 0
9117c6561b0b
permissions
-rw-r--r--
A new ancestor algorithm The old ancestor algorithm could get fooled into returning ancestors closer to root than it ought to. Hopefully this one, which strictly orders its search by distance from room, will be foolproof.
merge $1 $3 $2 || tkdiff -conflict $1 -o $1