Mercurial > hg > gitweb

view tkmerge @ 20:a664c2b624cf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
The actual hg remove fix from Thomas Hein
author mpm@selenic.com
date Wed, 04 May 2005 15:42:30 -0800
parents 9117c6561b0b
children
line wrap: on
line source

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