Mercurial > hg > gitweb

view tkmerge @ 179:ff5377a4b203

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add ~/.hgpaths to README
author mpm@selenic.com
date Fri, 27 May 2005 12:42:52 -0800
parents 9117c6561b0b
children
line wrap: on
line source

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