Git Release (2.22) Improves Merge handling, other other updates.

The announcement for Git 2.22 (by maintainer Junio Hamano) can be read on the kernel mailing list. 

Also, GitHub has an overview of the changes with Git 2.22.