Beyond Compare 3 :)

[Reeve of shinra]

Beyond Compare version 3 is in beta -- yaaaaaay!! It looks like they are adding some cool new features like three way merge which will be awesome!

:D:D

http://www.scootersoftware.com/beta3/moreinfo.php?zz=newfeatures

[Boofo]

Araxis Merge has 3-way merge for a while now.