tkmerge
author mpm@selenic.com
Wed, 18 May 2005 17:33:46 -0800
changeset 105 6eeb50050486
parent 0 9117c6561b0b
permissions -rw-r--r--
Date on its own line in file log

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