[darcs-devel] [issue1609] darcs conflict marking gives different results in different orders (OT TP2)

Florent Becker florent.becker at ens-lyon.org
Mon May 21 12:17:51 UTC 2012


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Le 20/05/2012 22:58, Guillaume Hoffmann a écrit :
> 
> Guillaume Hoffmann <guillaumh at gmail.com> added the comment:
> 
> The test for this issue now pass, what happened?
> 
I think it's an artifact of the fact that this test does not use the
return value of the first diff, which is still non-empty.

Florent

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk+6MmwACgkQTCPcDztjGo6nYACfU4FbDsUkGfbhlZ4UKiMEzBwk
x+sAnibYku1J99C08pDiTZqi9hE9Psbw
=Ysco
-----END PGP SIGNATURE-----



More information about the darcs-devel mailing list