61
Anyone have any favorite diffing tools? (lemmy.today)
submitted 1 year ago by to c/programming@programming.dev
30 comments fedilink hide all child comments
 

Does anyone have a favorite diff tool for reviewing lots of code? I'm thinking something along the lines like meld or vimdiff. I don't really need a git client. I'm comfortable with the git CLI. I'm mainly interested in making code reviews a little easier to manage.

I'm reviewing a large code change right now and the web interface sucks. It's slow. It doesn't load all the files at once. Cross referencing files sucks.

I know, I know. "Code changes should be small." I've already voiced that to my team, yet here we are. I'm trying to figure out a way to make this a little less miserable.

you are viewing a single comment's thread
view the rest of the comments
[–] 9 points 1 year ago* (last edited 1 year ago)

I use emacs's magit for git stuff (the bulk of things) and emacs's ediff for most other things.

Good if you know emacs, but hard to recommend using it for someone who doesn't.

EDIT: Oh, one exotic utility that's useful for some rare cases, not really for interactive merging of code

wdiff for word-level diffing. Most code can reasonably be diffed on a line-by-line basis, but that's not true for some text formats, which can have very long lines. Human, natural language in text format, is one good example.

  • permalink
  • fedilink
  • source
    •