Mercurial > hg > mercurial-crew-with-dirclash

view tkmerge @ 158:be7103467d2e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add 'hg serve' command for stand-alone server This adds a simple stand-alone web server mode to hg that exports the current repo for merging and browsing. The default port is 8000.
author mpm@selenic.com
date Wed, 25 May 2005 16:27:10 -0800
parents 9117c6561b0b
children
line wrap: on
line source

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