Mercurial > hg > gitweb

view tkmerge @ 118:a0e57df96e96

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add fileopener to move some pathname knowledge from filelog to repository
author mpm@selenic.com
date Fri, 20 May 2005 17:38:01 -0800
parents 9117c6561b0b
children
line wrap: on
line source

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