delta

I agree that the patience diff algorithm generally produces better results, but you don’t need the patdiff tool for that. You can configure Git’s own diffs to use patience: https://git-scm.com/docs/git-config#Documentation/git-config... I see that patdiff also provides word-level diffing. You could instead get that feature with `git diff --word-diff` or Delta (https://github.com/dandavison/delta).

I'm currently waiting on the integration between Delta and Difftastic: https://github.com/dandavison/delta/issues/535 Difftastic now has JSON output, whic should make it much easier to build this.

Semi-related, I recently discovered https://github.com/dandavison/delta: A syntax-highlighting pager for git, diff, and grep output It appears to enable choosing between unified and split views for each of those tools.

Some new diff tool https://github.com/dandavison/delta I just wanted to do a diff inside a bash script and ask the user if it looked ok, found this one.

Thanks for replying. I already use delta[1] as a diff viewer, but I suppose GIT_EXTERNAL_DIFF is a deeper integration than just a pager. I've been aware of your project for some time now, but haven't played around with it since I wasn't sure if it would help with automatic conflict resolution, and other issues Git often struggles with. But I'll give it a try soon, thanks again. I wasn't familiar with Unison. It looks interesting. We definitely need more novel approaches to programming, especially since our field will radically change in a few years as AI becomes more capable. [1]: https://github.com/dandavison/delta

I'm surely in the minority here. I've been using Emacs for almost a decade now, but I just can't get into the Magit workflow. I've tried several times, but always end up going back to Git on the command line. I have dozens of aliases, shell integrations, a nice diff viewer[1], etc., and interacting with Git has become muscle memory. I can commit, cherry-pick, rebase, bisect, fix conflicts, etc., in a fraction of the time it would take me to navigate Magit's UI. I'm sure with enough practice, a Magit user could do this more quickly and efficiently, but honestly, with some custom-built porcelain, Git's UI is not so bad. Though this could very well be Stockholm syndrome after using it for such a long time... For whatever reason, Magit's opinionated workflows never clicked with me. A part of it is the concern that it will do something weird t