this post was submitted on 21 Jun 2023
5 points (100.0% liked)

Git

2905 readers
1 users here now

Git is a free and open source distributed version control system designed to handle everything from small to very large projects with speed and efficiency.

Resources

Rules

  1. Follow programming.dev rules
  2. Be excellent to each other, no hostility towards users for any reason
  3. No spam of tools/companies/advertisements. It’s OK to post your own stuff part of the time, but the primary use of the community should not be self-promotion.

Git Logo by Jason Long is licensed under the Creative Commons Attribution 3.0 Unported License.

founded 1 year ago
MODERATORS
Ategon
canpolat
jnovinger
5
git difftool (self.git)
submitted 1 year ago by canpolat to c/git
14 comments fedilink hide all child comments
 

Which difftool do you use and why? I develop on Windows and I use KDiff3. It has worked flawlessly all these years. And just because of that I haven't really followed what else is out there. I suspect I'm in the minority?

you are viewing a single comment's thread
view the rest of the comments
[–] jnovinger 4 points 1 year ago (3 children)

I use meld if it's too much to manage in vim/neovim.

[–] canpolat 3 points 1 year ago (1 children)

meld is great. I used to use it when I developed in Linux. I tried to get its Windows port to work, but failed.

[–] jnovinger 1 points 1 year ago (1 children)

Ah, that sucks. I've only ever used it on Linux and Mac. I know it wasn't officially supported on Windows, but figured somebody had gotten it working decently.

[–] canpolat 2 points 1 year ago

Tried it a couple of times. Will probably give it another go in my next setup (around autumn).

[–] sisyphean 3 points 1 year ago

I mostly edit the raw file too and also use meld for the tricky cases

[–] truami 2 points 1 year ago

Love Meld. I use either it, or Intellij's built-in diff tool.