@fryguy1013 you seems to have done a comment (received a mail) but your comment do not appears on github :(

_Not sure what to do here. I got e6f9e91, and have other problems now on the very first commit before any of the merging stuff. It looks like the tfs working directory is not the same as where git-tfs is expecting it to be. Perhaps unrelated?_
I don't really understand your problem but I can tell you some things :
- I have not tested this last change (planed to do it but was not sure of what was asked by @spraints so preferred to ask before)
- I don't think it's linked because this method is not called (except if there is a big bug) when the changeset is not a 'merge' changeset
- in case, perhaps, you could use the previous version to see if there is the problem

But I'm interested by a better description of your problem. Feel free to give more details...