tkdiff ----linux下替代beyound compare的最佳工具

来源:互联网 发布:哪个编程语言最好学 编辑:程序博客网 时间:2024/06/05 17:45

Description

tkdiff is a graphical front end to the diff program. It provides a side-by-side view 
of the differences between two files, along with several innovative features such as diff bookmarks and a graphical map of differences for quick navigation.


tkdiff on MacOS X   

TkDiff may be started in any of the following ways:

    Interactive selection of files to compare:
      tkdiff

    Plain files:
      tkdiff FILE1 FILE2

    Plain file with conflict markers:
      tkdiff -conflict FILE

    Source control (AccuRev, BitKeeper, CVS, Subversion, Perforce, PVCS,
      RCS, SCCS, ClearCase)
      tkdiff FILE
tkdiff -rREV FILE
tkdiff -rREV1 -rREV2 FILE

    Additional optional parameters:
-a ANCESTORFILE 
-o MERGEOUTPUTFILE 
-L LEFT_FILE_LABEL [-L RIGHT_FILE_LABEL]

You can get it from here.