Mercurial > hg

view tkmerge @ 237:4f802588cdfb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from tah
author mpm@selenic.com
date Fri, 03 Jun 2005 13:32:37 -0800
parents 9117c6561b0b
children
line wrap: on
line source

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