Mercurial > hg

view tkmerge @ 32:6a4d8718bee0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add diffrevs function to compare two nodes
author mpm@selenic.com
date Fri, 06 May 2005 09:09:35 -0800
parents 9117c6561b0b
children
line wrap: on
line source

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