Summary: Compare: diffmerge and P4merge are best used, kdiff is more professional and supports automatic merge.
A csdiff
Download: http://www.componentsoftware.com/Products/CSDiff/index.htm
Features: 1) Free; 2) Installation required; 3) File and folder comparison; 4) Support source code, html and word documents
Screenshot:
1) Initial interface
2) Folder comparison
3) File comparison
Two diffmerge
Download: http://sourcegear.com/diffmerge/
Features: 1) Free; 2) No need to install; 3) File comparison; 4) Support 3 party file comparison and merge; 5) Windows shell integration; 6) Cross-platform;
Screenshot:
1) Initial interface
2) Folder comparison
3) 2 files compare and merge
4) Compare and merge three files
with
三 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;
Screenshot:
1） p4diff
with
2） p4 works
with
Four kdiff
Download: http://sourceforge.net/projects/kdiff3/
Features: 1) Free; 2) Installation required; 3) File comparison and folder comparison; 4) Support 3 party file comparison and merge; 5) Cross-platform; 6) Automatic merge
Screenshot:
1) Initial interface
2) Folder comparison
3) File comparison and merge
Five TotoriseMerge
Download: http://tortoisesvn.net/downloads
Features: 1) Free; 2) Need to install; 3) File comparison; 4) Support 3 party file comparison and merge;
Screenshot:
1) Initial interface
2) File comparison and merge
六 Winmerge
Download: http://winmerge.org/
Features: 1) Free; 2) Installation required; 3) File comparison and folder comparison; 4) Support merge; 5) Shell integration
Screenshot:
1) Initial interface:
2) Folder comparison
3) File comparison
Seven command line diff
For the diff of execution, diff.exe can be used in Linux, fc, comp and diff.exe from Linux can be used in Windows.
Eight Linux diff and merge tools
Report ： http: //meld.sourceforge.net/index.html
Nine Araxis Merge good folder comparison tool
