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 Thomas Arendsen Hein <thomas@intevation.de>
Thu, 02 Jun 2005 07:06:29 +0100
changeset 234 3427806d5ab9
parent 0 9117c6561b0b
permissions -rw-r--r--
ui.warn can use more than one argument like the other ui methods.

merge $1 $3 $2 || tkdiff -conflict $1 -o $1
mercurial-crew-with-dirclash