Programming

23587 readers

120 users here now

Welcome to the main community in programming.dev! Feel free to post anything relating to programming here!

Cross posting is strongly encouraged in the instance. If you feel your post or another person's post makes sense in another community cross post into it.

Hope you enjoy the instance!

Rules

Follow the programming.dev instance rules
Keep content related to programming in some way
If you're posting long videos try to add in some form of tldr for those who don't want to watch videos

Wormhole

Follow the wormhole through a path of communities !webdev@programming.dev

founded 2 years ago

MODERATORS

snowe@programming.dev

Ategon@programming.dev

MaungaHikoi@lemmy.nz

UlrikHD@programming.dev

Anyone have any favorite diffing tools? (lemmy.today)

submitted 3 weeks ago by paequ2@lemmy.today to c/programming@programming.dev

28 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

[–] tal@lemmy.today 7 points 3 weeks ago* (last edited 3 weeks 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.