Mercurial > hg

view tkmerge @ 100:526722d24ee5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
reorganize code into classes clean up html code for w3c validation
author jake@edge2.net
date Fri, 13 May 2005 17:48:10 -0700
parents 9117c6561b0b
children
line wrap: on
line source

merge $1 $3 $2 || tkdiff -conflict $1 -o $1