Mercurial > hg > pyhgsh

view tkmerge @ 154:1d5f799ebe1e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixed problem with head/body tags, added dtd, fixed table attributes add quotes around all attributes (w3c recommendation) pages pass w3c validator
author jake@edge2.net
date Tue, 24 May 2005 16:08:09 -0700
parents 9117c6561b0b
children
line wrap: on
line source

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