git_backend: write trees involved in conflict in git commit header

git_backend: write trees involved in conflict in git commit header #5888