Post Syndicated from original https://lwn.net/Articles/891733/

Version 2.36.0 of the Git
source-code management system is out. As usual, the list of new features
is long; this GitHub
blog post covers some of the highlights:

But this [merge conflict] output can be understandably difficult to
interpret. In Git 2.36, --remerge-diff takes a different
approach. Instead of showing you the diffs between the merge
resolution and each parent simultaneously, --remerge-diff
shows you the diff between the file with merge conflicts, and the
resolution.