Mercurial > hg > gitweb

view tkmerge @ 87:b2b3fdbd79f4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Verify improvements: Check existence of parents of changesets and manifests Count errors Use ui for display Catch and count unpack exceptions Print error count and exit with non-zero status on error
author mpm@selenic.com
date Tue, 17 May 2005 12:23:53 -0800
parents 9117c6561b0b
children
line wrap: on
line source

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