Summary: Compare down: Diffmerge and P4merge best use, Kdiff more professional, support automatic merge.
A Csdiff
Download: http://www.componentsoftware.com/Products/CSDiff/index.htm
Features: 1) free, 2) need to install, 3) file and folder comparison, 4) Support source code, HTML and Word documents;
:
1) Initial interface
2) Folder comparison
3) file Comparison
Two Diffmerge
Download: http://sourcegear.com/diffmerge/
Features: 1) free, 2) No installation required, 3) file comparison, 4) Support 3-party file comparison and merge; 5) Windows Shell Integration; 6) cross-platform;
:
1) Initial interface
2) Folder comparison
3) 2 File comparisons and merge
4) 3 File comparisons and merge
And
Three P4 Diff and merge
Download: http://www.perforce.com/perforce/products/merge.html
Features: 1) free, 2) need to install, 3) file comparison, 4) Support 3-party file comparison and merge;5) cross-platform;
:
1) P4diff
And
2) P4 Merge
And
Four Kdiff
Download: http://sourceforge.net/projects/kdiff3/
Features: 1) free, 2) need to install, 3) file comparison and folder comparison, 4) Support 3-party file comparison and merge;5) cross-platform; 6) Automatic merge
:
1) Initial interface
2) Folder comparison
3) file comparison and merge
Five Totorisemerge
Download: http://tortoisesvn.net/downloads
Features: 1) free, 2) requires installation, 3) file comparison, 4) Support 3-party file comparison and merge;
:
1) Initial interface
2) file comparison and merge
Six Winmerge
Download: http://winmerge.org/
Features: 1) free, 2) need to install; 3) file comparison and folder comparison; 4) shell Integration support merge;5)
:
1) Initial interface:
2) Folder comparison
3) file Comparison
Seven Command line diff
For the diff of Life Line, Diff.exe can be used in Linux, and Windows can use Fc,comp and Diff.exe from Linux.
Eight Linux diff and merge tools
Meld:http://meld.sourceforge.net/index.html
Nine Araxis merge very good folder comparison tool
Finish!
Free easy to use diff and merge Tools big Summary