# HG changeset patch
# User sandnerr
# Date 851075108 -3600
# Node ID 3cf05073023368c52b938614043fe9b00fcbb874
# Parent  e9ef33e0d061a374add198c856f157474736042e
testing cvs merge algorithm

diff -r e9ef33e0d061 -r 3cf050730233 src/HOLCF/cvstest
--- a/src/HOLCF/cvstest	Fri Dec 20 10:39:44 1996 +0100
+++ b/src/HOLCF/cvstest	Fri Dec 20 10:45:08 1996 +0100
@@ -1,3 +1,4 @@
    asdfa  dsf
         yxcv
 qwerqewrqwer
+brabbel
\ No newline at end of file