Mercurial > hg

view tkmerge @ 159:f9d8620ef469

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add example CGI script This gives an example of how to easily use hgweb via CGI
author mpm@selenic.com
date Wed, 25 May 2005 16:28:23 -0800
parents 9117c6561b0b
children
line wrap: on
line source

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