How to include conflict information in the merge commit, such as which files have conflicts (which may have been resolved in the commit)
The main goal is to get the conflict resolution status of git merge, similar to how IDEA includes #conflict information in the git merge commit.