Mercurial > hg > pyhgsh

view tkmerge @ 76:d993ebd69d28

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add lazy{parser,index,map} to speed up processing of index files
author mpm@selenic.com
date Tue, 17 May 2005 00:33:22 -0800
parents 9117c6561b0b
children
line wrap: on
line source

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