log hgmerge @ 303:15a9e55e7ea5

age author description
Fri, 10 Jun 2005 07:50:20 +0100 Thomas Arendsen Hein Check if $DISPLAY is set before using tkdiff or kdiff3.