File Comparison Tool with Combined File Viewer

Question

I am looking for a file comparison tool with a combo file view. For me, this makes the best use of screen space, because fixed lines are only displayed once, and I don’t need to move my eyes too much to go from “to” to “after”. The screenshot below shows what I mean - blue and red text shows the differences, black text on a white background is an invariable part of the file.

I checked Beyond Compare and WinMerge and CompareIt from the main list , but they do not have this function (if I did not miss it?). MKS Visual Difference has a "combined file" view, but you can only get this as part of an expensive 400- piece toolkit . I am looking for a cheaper option. I would like the GUI not to be a command line tool, and I like to see all the unchanged lines, not only for some of them.

alt text http://img186.imageshack.us/img186/9503/visualdifference2.png

Answer 1

, Guiffy - diff/merge. . 3- .

EDIT (MarkJ) 3-way merge , , Guiffy " " ! :

alt text http://img41.imageshack.us/img41/4558/guiffytogether.png

Answer 2

, diff -u, , .

$ diff -10 -u 1 2
--- 1   2009-08-19 12:48:12.847750000 +0200
+++ 2   2009-08-19 12:48:50.925875000 +0200
@@ -1,13 +1,13 @@
 Dim bOk As Integer

 Select Case Col

        Case giCOL_OPTPOLNAME
-               Value = gParamRecOpt.PolName(Row)
+               Value = Trim$(gParamRecOpt.PolName(Row))

        Case giCOL_OPTINCLUDE
                Value = Format$(gParamRecOpt.Include(Row))

        Case giCOL_OPTSHORTLONG
                Value = Format$(gParamRecOpt.Include(Row))


$

diff (GPL) cygwin.