I’m looking for a file compare tool with a “combined file” view. To me, this makes the best use of screenspace because unchanged lines are only shown once and also I don’t have to move my eyes much to move from “before” to “after”. The screenshot below shows what I mean – the blue and red text show the differences, the black text on white background is the unchanged portion of the file.
I checked Beyond Compare and WinMerge and CompareIt from the master list, but they don’t have this feature (unless I’m missing it?). MKS Visual Difference has “combined file” view, but you can only get that as part of an expensive toolkit of 400 programs. I’m looking for a cheaper option. I’d like a GUI not a command-line tool, and I like to be able to view all the unchanged lines not just some of them.
alt text http://img186.imageshack.us/img186/9503/visualdifference2.png
I’ve never tried it, but Guiffy is a cross platform diff/merge tool. It has a 3-way merge view and is reasonably priced. Here’s a screenshot of 3-way merge.
EDIT (MarkJ) 3-way merge wasn’t what I was looking for, but the Guiffy “together view” looks great! I found a screenshot of that:
alt text http://img41.imageshack.us/img41/4558/guiffytogether.png