Mercurial > hg > mercurial-crew-with-dirclash

view tkmerge @ 166:39624c47060f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgweb: don't blow up on search for unknown keys
author mpm@selenic.com
date Thu, 26 May 2005 10:11:05 -0800
parents 9117c6561b0b
children
line wrap: on
line source

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