Git 2.36.0 released

Version 2.36.0 of the Gitsource-code management system is out. As usual, the list of new featuresis long; this GitHubblog post covers some of the highlights:

But this [merge conflict] output can be understandably difficult tointerpret. In Git 2.36, --remerge-diff takes a differentapproach. Instead of showing you the diffs between the mergeresolution and each parent simultaneously, --remerge-diffshows you the diff between the file with merge conflicts, and theresolution.