beediff

[piotrek]

No is released version 1.0 of beediff.
It is implemented a merge process between both files.

http://www.beesoft.org/beediff.html

regards
piotr

[wysota]

Maybe it'd be a good idea to remove the dependency and embed diff code directly in your application?

[piotrek]

Maybe it'd be a good idea to remove the dependency and embed diff code directly in your application?

Yes, I'm thinking about.