[RFC][merge] Patience Sorting Diffs

[Aaron Bentley]

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

John Arbash Meinel wrote:
> I found a specific bug where I was diffing from "alo:bhi" versus "blo:bhi".
> 
> I'm writing some test cases now, to make sure that code path is tested.

Ah.  Sounds promising.

My initial tests were a bit discouraging, as the patience merge
generated more conflicts (and more conflicted files) than the standard
merge.  It also deleted / failed to insert one section of OTHER that
should have been present.

But that was with an ugly hack to handle the duplicated ranges, and I'm
still hopeful that the end result will be better.

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

iD8DBQFDoF0Y0F+nu1YWqI0RAvkGAKCIKzII0Kgqu2u8Djm5MjdrNCWBoACeIZrB
eJeneNZ2JMSBLq4c289hpwQ=
=vQ4j
-----END PGP SIGNATURE-----