Mercurial > hg > pyhgsh

view tkmerge @ 109:95699294f580

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Annotate was being too clever trying to work in place, and triggering its assert. Simplify it, fix it, and speed it up a tiny bit.
author mpm@selenic.com
date Fri, 20 May 2005 17:22:02 -0800
parents 9117c6561b0b
children
line wrap: on
line source

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