Mercurial > hg > pyhgsh

view tkmerge @ 141:5f471a75d607

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Simple script to recompress a log file
author mpm@selenic.com
date Mon, 23 May 2005 16:06:25 -0800
parents 9117c6561b0b
children
line wrap: on
line source

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