title: git recover single file that was deleted during a merge
body: <p>I'm  currently in branch 'foo'. I just ran <code>git merge master</code>. Only problem is there was a certain file in foo that I wanted to keep. Is there a way to get it back but keep all the other changes from merge master?</p>