Mercurial > hg > pyhgsh

view tkmerge @ 173:8da1df932c16

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgweb: make navigation of changesets a bit nicer
author mpm@selenic.com
date Thu, 26 May 2005 22:47:43 -0800
parents 9117c6561b0b
children
line wrap: on
line source

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