Mercurial > hg > gitweb

view tkmerge @ 103:33500fe7d56c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
adding subdir support for log and status commands
author jake@edge2.net
date Sun, 15 May 2005 15:30:36 -0700
parents 9117c6561b0b
children
line wrap: on
line source

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