Diff/Merge library in java

[Erdinc Yilmazel]

Do you know an open source java library for merging, patching diffing
two source files? I need a functionality such as the one that
subversion provides when updating from the repository. It
automatically merges your working copy of a file with the one from the
repository, if it fails because of a conflict, it leaves the conflict
resolution to the developer. Any help is appreciated.

Thanks,
Erdinc YILMAZEL

[Renjith Nair]

Try Winmerge (http://winmerge.org/) or kdiff3 (http://kdiff3.sourceforge.net/)

Winmerge is quite stable but only for windows. Kdiff3 has 3 way merge functionality and supports win,mac and linux.

Regards,
renjith

2009/3/18 Erdinc Yilmazel <erdincy...@gmail.com>

[Brendan Quinn]

how about http://code.google.com/p/google-diff-match-patch/ ? never used it but it looks useful. There is a Java version (among others)

Brendan.

2009/3/18 Erdinc Yilmazel <erdincy...@gmail.com>

[Erdinc Yilmazel]

Thanks Renjith,
I am looking for a library that I can embed in my own java
application. Not a desktop program that i can use for that purpose.
Thank you any way.

Erdinc

[Erdinc Yilmazel]

Thank you Brendan, I am going to look at it.

[A Behling]

beyond compare, not open source, but money well spent ... worth each penny ...

2009/3/18 Erdinc Yilmazel <erdincy...@gmail.com>

[Renjith Nair]

Oops my mistake. Didn't read email carefully.. quick reply from work.

2009/3/18 Erdinc Yilmazel <erdincy...@gmail.com>

[Neil Bartlett]

Parts of the Eclipse "team" support, which includes their comparison
tools for use with different VCSs, are general enough to be used as a
standalone library in another application.

Regards,
Neil