Hacker News Reader

Comment by sidmitra | Hacker News Reader

There is also https://meldmerge.org/ which i've used on Linux and Mac before.

Does meld include any sort of git browser to dig into old commits of the same file? The ability to pick a file and compare it's states is a pain point I find with git UI apps. For example, TortiseGit will do this but it requires some painful non-intuitive menus and right clicking to resurrect the older data

I don't believe meld embeds any git specific support, but if you configure git to use meld as the tool for diffing and merging, then when you use the git CLI to display a diff, it should invoke meld

e.g. in the CLI you might do something like `git diff commit_a commit_b -- some/path/in/repo` to show the diff from commit_a to commit_b limited to some path

Refer to the "configuration" sections for

  https://git-scm.com/docs/git-difftool
  https://git-scm.com/docs/git-mergetool

these git documentation pages mention meld (along with many other diff tools).

Seconding meldmerge. Not paying $70 (BeyondCompare) for what meldmerge does just as well and for free.

Reply on news.ycombinator.com