Mercurial > hg > mercurial-crew-with-dirclash

view tkmerge @ 57:115106376f45

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgweb.py from Jake Edge remove hgweb.py from URLs so that it will work as index.cgi
author mpm@selenic.com
date Wed, 11 May 2005 17:11:10 -0800
parents 9117c6561b0b
children
line wrap: on
line source

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