开发者

Graphically view long line diffs that mostly match

I have two data files. They're both 5000 lines long, and each row is ~1开发者_StackOverflow社区0000 characters wide. They are nearly identical, except a few characters on some lines are different. Is there any tool that will jump both vertically and horizontally to the disagreements for both sides, so I can see what's different?

I'm using OSX, but I could use Linux or windows if it was absolutely necessary. I've tried:

  • FileMerge
  • KDiff3
  • DiffMerge
  • command line diff
  • Now trying to install meld


vimdiff, or even better its graphical twin gvimdiff, would work if there is at most two edits per line. It highlights the part between the first and last changed character on a line. It also collapses the parts of the files which are identical.

These are part of Vim; I have no idea whether the MacOS versions contain (g)vimdiff.

Note that in my experience Vim sometimes becomes slow with long lines, so that might hurt you for this specific use case.


Araxis Merge may do what you're after (it does character-diffs within lines), and there's an OSX version. It's not cheap, and I've never tried it on 10,000 character wide lines, though.

0

上一篇:

下一篇:

精彩评论

暂无评论...
验证码 换一张
取 消

最新问答

问答排行榜