ansaurus

Question

File compare tool with combined file view feature

Answer 1

+1 A:

Of course there is diff -u which will produce output very close to what you describe.

$ 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))


$

You can get the diff program for free (GPL) as part of cygwin.

hlovdal 2009-08-19 10:45:07

Thanks, that is similar to what I'm looking for. Although I'd like a GUI. I'd also like the ability to view *all* the unchanged lines (for reading around source code changes to see whether they're correct or not)

MarkJ 2009-08-19 13:18:27

Answer 2

+1 A:

Rich Seller 2009-08-19 10:50:56

3 way merge wasn't what I was looking for, but Guiffy has a "together" view that looks great! I've taken the liberty of editing your answer to show a screenshot of that view from the Guiffy site. +1, and likely to be accepted as **the** answer unless someone outdoes you soon.

MarkJ 2009-08-19 13:31:48

Don't know if that image is a good one or not as imageshack is blocked by my work proxy. If it's what you're after though then that's grand. Would be interested in your opinion of whether its worth the cost over WinMerge or Beyond Compare

Rich Seller 2009-08-19 13:34:53

I linked to the original image from my text, here's the link again. Is $60 worth it? Definitely, I'm always comparing files: code reviews and when I'm having a last look at my own work before checking in. http://www.guiffy.com/shots.html

MarkJ 2009-08-19 16:26:02

Answer 3

A:

I wrote a tool to diff web code regardless of differences from comments and whitespace. This means my tool can diff a completely minified file against a similar beautified file. It is written entirely in JavaScript so you try it directly in your browser without downloading or installing anything.

http://mailmarkup.org/prettydiff/prettydiff.html

2009-08-21 13:02:21

ansaurus

tags:

views:

answers:

File compare tool with combined file view feature

related questions