8 ms·

There's also http://www.colordiff.org/ http://www.colordiff.org/

• selectnull 12y ago
  It doesn't seem to be side by side, while icdiff is. Colors by themselved are not an issue as git supports it natively. Have I miseed something? edit: fix typo
  • dima55 12y ago
    diff -y is side-by-side. As far as I know colordiff does per-line coloring, while icdiff seems to have finer granularity. This dude really should have patched colordiff, though. Or just used emacs.
    • cbr 12y ago
      colordiff is just a perl script to colorize diff's output. Patching it to add support for the kind of coloring I want to do here would be a lot of work. As for using emacs, there are many cases when I want a stand-alone diff tool.
    • selectnull 12y ago
      Wow, all these years and I haven't known about diff -y. Thanks.
• cbr 12y ago
  colordiff looks like: http://www.colordiff.org/screen2.jpg http://www.colordiff.org/screen2.jpg It's just coloring the standard diff output so lines starting with > or + are yellow and ones starting with < or - are green. This is also what "git diff" does by default: http://www.jefftk.com/git-diff-color-2x.png http://www.jefftk.com/git-diff-color-2x.png icdiff is doing a side-by-side diff, and it's only coloring the changed sections of lines: http://www.jefftk.com/icdiff-side-by-side-2x.png http://www.jefftk.com/icdiff-side-by-side-2x.png
  • mitchty 12y ago
    Not all that different than what you can achieve with git diff --color-words Example: http://i.imgur.com/smubTnH.png http://i.imgur.com/smubTnH.png
    • cbr 12y ago
      git diff --color-words is good. Here's what that looks like on the same file: http://www.jefftk.com/diff-color-words-2x.png http://www.jefftk.com/diff-color-words-2x.png
• hrjet 12y ago
  One more called cdiff: https://github.com/ymattw/cdiff https://github.com/ymattw/cdiff (works with repositories; not a general diff replacement.)