Update index for conflicts on restoration of discarded changes #559

When you undo a discard, there's a chance that one or more of the files effected will have merge conflicts. Update the git index with the conflicting files to trigger the rest of our conflict resolution machinery.