Mercurial > hg-stable

view tkmerge @ 95:589f507bb259

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Beginnings of transaction undo support
author mpm@selenic.com
date Wed, 18 May 2005 16:31:51 -0800
parents 9117c6561b0b
children
line wrap: on
line source

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