log hgmerge @ 4362:390d110a57b8

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
Sat, 11 Mar 2006 21:33:19 -0800 Vadim Gelfer run merge program in repo root.
Fri, 10 Mar 2006 23:34:36 -0800 Vadim Gelfer merge with self.