For some reason "git merge --squash" didn't preserve squashed commit
information after resolving the conflicts manually. So here the changes
are explained in detail in the extra ChangeLog.