Mercurial Merge Issue
===

Here's what happened.

Original directory was cloned to create a feature.

Cloned directory was pushed to the original before the original committed its changes.

Original was then committed.

I didn't know how to get the changes from both merged together. Whatever I tried, just switched between the two. I could pick individual files to revert to, but I couldn't seem to get an actual merge going. Mercurial didn't seem to think a merge was needed.