view tkmerge @ 169:e93a16de0c66

hgweb: actually commit the tags template
author mpm@selenic.com
date Thu, 26 May 2005 13:02:04 -0800
parents 9117c6561b0b
children
line wrap: on
line source

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