log hgmerge @ 2573:82e3b2966862

age author description
Fri, 07 Apr 2006 22:31:54 +0200 Radoslaw Szkodzinski Try to use /usr/bin/test or /bin/test to work around missing features. 0.8.1