Mercurial > hg > gitweb

view tkmerge @ 110:c37c7f784ee3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Move hg from storing files in data with base64 encoding to full pathnames with .i and .d extensions. This means we naturally get good FS layout, and cp and tar fix things up nicely rather than pessimizing layout.
author mpm@selenic.com
date Fri, 20 May 2005 17:27:21 -0800
parents 9117c6561b0b
children
line wrap: on
line source

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