Mercurial > hg > mercurial-crew-with-dirclash

view tkmerge @ 48:9f64181ff9a9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix resolve bug putting unchanged files in resolve cset
author mpm@selenic.com
date Wed, 11 May 2005 09:44:12 -0800
parents 9117c6561b0b
children
line wrap: on
line source

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