Mercurial > hg > mercurial-crew-with-dirclash

view tkmerge @ 101:6da5cf0c4193

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
added pagination for changes (front) page added manifest list added file history
author jake@edge2.net
date Tue, 17 May 2005 16:03:50 -0700
parents 9117c6561b0b
children
line wrap: on
line source

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