Big bad merge and local uncommited work became one. How do I rescue my changes?

[San Jacobs]

Title says most of it. A coworker submitted a massive changeset that affected most of the files in the project, including the ones I was working on.
In my infinite wisdom, I decided to do the merge without committing my work first. The merge went badly, but couldn't find a way to undo this.
Now, my work is trapped in a changeset along with a bunch of broken files from the merge.

Is there a way to create a new changeset where the merge is undone? How do I rescue my work?

[ollieblanks]

I believe what you want is a subtractive merge. Please see links below:

http://blog.plasticscm.com/2014/07/how-to-undo-merge.html
https://www.plasticscm.com/documentation/advanced-version-control-guide

Hope this helps!