I just pulled the latest patches from darcs stable and run
a slowtest that failed.  I have attached the output.


-- 
Tommy Pettersson <[EMAIL PROTECTED]>
Checking that conflict resolution is valid... Falsifiable, after 35 tests:
[JKdu8IUbz6VuoAWr
FX6LeK5b**qexm0Br4ag
 5/A.OM/yhT5OBGi
 DZrjbD4C
 onE/
 hA
 5qXTZ6iQpjqg
 rTMu
 i~P2b-/.YZw1f4s2
 CLU-/DBIrxDXO
 
 KV5CuCGOI-0QO.
 WoXr7~etFH
 iTk5z
 
 DgpHOMmj-
 Kl3jigMXg2MX
 PYH
] merger 0.0 (
hunk ./test 1
+nLSu
binary ./test
oldhex
*4f2c6f58726e5664536c4f69583262
newhex
*5742785074756e765945475136445561
)

[YqH
vPihQbWp8Y-L4Rw**,VkIKO1-TFV3
 kfjX-jE~ohlM,
 JfgHN8A-Omp
 JFAix5DyUq3hu0
 G
 nzn3wVEH1xk
 4Lj7ry,f5Q/,DF
 Mfmp3BKPiMkh
 Jih76EdD
 M.S4D.95iZhZ
 AO
 dftF
 gp3vnwc,~A/
 jmRk1.6U8c6Iy
] [J~o-waQgd7eFkZN
hip**g3PhXzQx6T-
 Hj1u/
 Njm,Yd.
 NL
 aoO
 SDxyZsV0hJG
 EtUusjA8
 
 fbiisoU
 FIE3qip2w
 -zinjS2Q,Df
] 
<
[BJLyvrEVAm3
dZBgGcs**Ey0pYlt5uLfyGM
 BVH0KcExEyEi
 k62IN93Z
 ulAK0rpkC2wU.Zk
 fZD7VSPWtxxOLPj
 13Zqiend5y2o5f
 WjLfIQdO6sBO
 NH-df,OQZ
 .xyP..QezsW2l
 ru
 Y7rFJ-jKpFbfW
 vQ3dCNDa,cr01K7I
 f
 QZsM99Qt3kgJj
 o
 S4Y
] 
> hunk ./test 3
-silly this hello
-test a silly
-DZb3,5
+token silly test
+is hello silly

_______________________________________________
darcs-devel mailing list
[email protected]
http://www.abridgegame.org/cgi-bin/mailman/listinfo/darcs-devel

Reply via email to