title: Undo/Redo Conflict Resolution action in TFS
body: <p>Is there a way to undo/redo a conflict resolution in VS2013/TFS? </p>
  
  <p>Accidentally clicked "Use Local Changes" when really meant to do "Resolve Conflicts". Since "Use Local Changes" was clicked the changes are all intact. Is there a way to force VS2013/TFS to resolve conflicts again so this time we can merge?</p>