Mercurial > hg > mercurial-crew-with-dirclash

view tkmerge @ 196:48827121af7e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add export, recover, and undo to the man page add export to hg help
author jake@edge2.net
date Mon, 30 May 2005 09:53:48 -0700
parents 9117c6561b0b
children
line wrap: on
line source

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