Mercurial > hg > mercurial-crew-with-dirclash

view tkmerge @ 104:20b3e7aad499

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Pull from hg://edge2.net/hg/cmds
author mpm@selenic.com
date Wed, 18 May 2005 17:29:10 -0800
parents 9117c6561b0b
children
line wrap: on
line source

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