If I have two heads in my repo - C and D which have the common parent of B - and I do an `hg merge` then a `hg commit`, what exactly is in that merge changeset? I am trying to understand what I see what I do `hg diff -c xyz` where xyz is the id of the merged changeset.

Will the changeset show the diffs of all files modified in C and D vs. the state of those files as they existed in the common parent repository B?