Sql – side-by-side diff program that supports dragging blocks of text into windows

diff()mergesql

I'm looking for a side-by-side diff program a la xxdiff or DiffMerge that, instead of diffing files, allows blocks of text to be dragged into either the left side or right side window.

I'm refactoring some SQL embedded in source files, and it would be nice to drag the sql statements from each source file into the diff program instead of having to cut and paste to files and then diff the files.

Any clues appreciated, bonus for mac and linux compatibility… Thanks!

update: both winmerge and beyond do this perfectly… thanks again guys!

Best Answer

Winmerge allows you to use Alt + Left and Alt + Right to move different text blocks to left and right.

It's free / open source and overall great tool as well.

Related Solutions

Git – Msys Git Merge Tool Command Options Issue

If you look at the file that is conflicted, you'll notice the standard Theirs >>>>>>> and <<<<<< Mine markers. WinMerge understands these as merge conflicts, so it does not need 'Theirs' and 'Mine' to be specified explicitly; it just needs to be told which file it is that has the conflict markers.

We know the file in the working directory contains the markers.
It makes sense that the file we are merging to will also be this file - we also know that git mergetool makes the $MERGED variable available that names that file.
```
[mergetool "winmerge"]
    cmd = 'C:/Program Files/WinMerge/WinMergeU.exe' \"$MERGED\"
```

This is all you need to hook git up with WinMerge for merge/conflict resolution; no scripts or command-line switches needed. Refer to the 3rd command-line form in the docs (linked by the OP, above) and the explanation of conflictfile argument.

R – word document format that supports version diff comparisions

MS Word 2007 itself can compare docs for you! Check this link. Is this what you are looking for?

Best Answer

Related Solutions

Git – Msys Git Merge Tool Command Options Issue

R – word document format that supports version diff comparisions

Related Topic