Mercurial > hg

view tkmerge @ 3:3a6392190075

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Ignore build/ and .pyc files
author mpm@selenic.com
date Tue, 03 May 2005 18:35:26 -0800
parents 9117c6561b0b
children
line wrap: on
line source

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