Mercurial > hg > gitweb

view tkmerge @ 202:e875a0cf7f3a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Call python via env in hgweb.cgi
author mpm@selenic.com
date Tue, 31 May 2005 21:24:14 -0800
parents 9117c6561b0b
children
line wrap: on
line source

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