I am using the tf.exe vc merge /discard command to remove a few changesets as merge candidates, and was wondering if there was a way to undo this operation?
After the merge is checked in, you can roll back the merge for those specific files if I'm not mistaking to revert the loss of the merge ticket.
Worst case you can perform a tf vc merge /force on these files.