Mercurial > hg > pyhgsh

view tkmerge @ 13:eb87b7dc4236

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix empty transaction destruction
author mpm@selenic.com
date Wed, 04 May 2005 09:32:39 -0800
parents 9117c6561b0b
children
line wrap: on
line source

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