Mercurial > hg > mercurial-crew-with-dirclash

view tkmerge @ 62:022d98aa0a2a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix tabs Update version number Set new merge as the default
author mpm@selenic.com
date Thu, 12 May 2005 01:23:26 -0800
parents 9117c6561b0b
children
line wrap: on
line source

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