Mercurial > hg > mercurial-crew-with-dirclash

view tkmerge @ 99:db5eb6a86179

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
making change list be reverse ordered adding link to revision in change list changing revision links to display checkin
author jake@edge2.net
date Fri, 13 May 2005 17:27:14 -0700
parents 9117c6561b0b
children
line wrap: on
line source

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