文件对比工具

1、KDiff3

下载地址：https://sourceforge.net/projects/kdiff3/

 

2、Diffuse

Diffuse is a small and simple text merge tool written in Python. With Diffuse, you can easily merge, edit, and review changes to your code.

http://diffuse.sourceforge.net/

Compare a Set of Files
$ diffuse file1 file2 file3

Review Local Changes or Fix Merge Conflicts
$ diffuse -m

Compare Specific Revisions
$ diffuse -r rev1 -r rev2 file

Inspect a Revision
$ diffuse -c rev