Diffconflicts Alternatives

diffconflicts reviews and mentions

• Ask HN: Share a shell script you like
  17 projects | news.ycombinator.com | 13 Aug 2023

  diffconflicts [dc] lets you resolve diffs as a two way diff between what's in the conflict markers instead of including the resolved parts in the diff. It opens the diff in vim but could be adapted for other editors. Verbose explanation: https://github.com/whiteinge/diffconflicts/blob/master/READM...

  The author converted it to a vim plugin with the same name, but I use a different vim plugin implementation [mergetool].

  [dc]: https://github.com/whiteinge/dotfiles/blob/master/bin/diffco...

• Integrating Git and (Neo)Vim: LazyGit + Fugitive + MergeTool for maxiumum efficiency [Showcase]
  3 projects | /r/vim | 16 Mar 2023

  I like vim-mergetool for merging in vim. It's inspired by the diffconflicts method (but written in vimscript): Diff the resolved conflicts instead of a three way diff with base. You can also switch to three way with :MergetoolToggleLayout LmR too, but I usually only switch to diffing resolved against theirs or ours.

• Poll: how do you jump to Git conflict markers?
  5 projects | /r/neovim | 14 Dec 2022

  https://github.com/whiteinge/diffconflicts as a merge tool

• What is the coolest, unknown(-ish) plugin that you're using that other people could benefit from?
  33 projects | /r/neovim | 16 Sep 2022

  https://github.com/whiteinge/diffconflicts is not unknown, but I think deserves way more attention. It transforms the way you resolve merge conflicts unlike any other tool I've seen.

• Your git setup for neovim?
  12 projects | /r/neovim | 29 Aug 2022

  For resolving conflicts, I like https://github.com/whiteinge/diffconflicts. It's really good at cutting the noise from conflict markers and only showing what matters.

• Here's a question
  15 projects | /r/vim | 23 Jul 2022
• Vim Regex
  1 project | /r/vim | 24 May 2022

  For resolving conflicts I recommend https://github.com/whiteinge/diffconflicts, the demo video explains it best https://www.youtube.com/watch?v=Pxgl3Wtf78Y.

• What have you changed in your VIM workflow recently?
  4 projects | /r/vim | 23 May 2022

  have you tried diffconflicts? started using it ages ago, might be worth checking out if you get tired of editing by hand.

• Which tools do you use for Git Conflicts?
  11 projects | /r/neovim | 1 May 2022
• Is there a better way to see git diff in vim?
  3 projects | /r/vim | 27 Feb 2022

  I end up using https://github.com/whiteinge/diffconflicts it does the job I have looked for, I have adjusted the way it a bit to look more like 3 splits solver rather with 2 splits.

• A note from our sponsor - SaaSHub
  www.saashub.com | 1 Sep 2025

  SaaSHub helps you find the best software and product alternatives Learn more →