Mercurial > hg > pyhgsh

view tkmerge @ 60:e32fdbd97839

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add hg:// protocol Fix some of the getchangegroup logic
author mpm@selenic.com
date Thu, 12 May 2005 01:21:58 -0800
parents 9117c6561b0b
children
line wrap: on
line source

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