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

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/README.md#three-way-diffs-are-hard 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/diffconflicts https://github.com/whiteinge/dotfiles/blob/master/bin/diffco... [mergetool]: https://github.com/idbrii/vim-mergetool https://github.com/idbrii/vim-mergetool