shelve does not shelve pending merges and conflicts

[Russ Brown]

I just had to perform a large merge which included a number of complex conficts. Midway through resolving these conflicts, I needed to stop and work on something else, so I shelved the merge.

It doens't seem to have worked properly. After the shelve the pending merge and conflicts were still there, and after unshelving they were gone. It would be ideal if the entire state could be shelved so it could be resumed later.