star or parallele merge

[Aaron Bentley]

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

David Allouche wrote:
> I'm not sure what you mean by "linewise merge" if you mean just plain
> "simple weave merge", it has at least one documented silent failure mode
> that make it unacceptable for me.

Three-way also has silent failures there.  We gotta use something.  What
do you suggest?

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

iD8DBQFDQ8jA0F+nu1YWqI0RAjbnAJwNVe2VMZ8box3c91i+14mnISIhnACgiEzH
OyH6dtU/WeLvHUqoX8H64jM=
=P8n3
-----END PGP SIGNATURE-----