chud575

i wanted to undo whatever was done, i couldn't cancel the merge. the solution was to go into the .plastic folder and delete plasticmerge file. This is a bug btw, not expected behavior. i merged, and then suddenly was able to switch branches without receiving the typical unfilled branch entry

So, no matter what branch i switch to, this crazy merge link follows me, and i cant get rid of it. Also, whenever i switch branches, i get this popup dialogue, which coincidentally mentions the files from the merge. any ideas?