title: Git: File deleted locally but changed remotely. How do I see their changes?
body: <p>On a reasonably large project I occasionally find myself in the following situation during a merge (I'm using the Windows GUI for Git called GitExtensions, but I'm equally comfortable with the command line):</p>
  
  <blockquote>
    <p>File  does not have a local revision. The file has been deleted locally (ours) but modified remotely (theirs).</p>
  </blockquote>
  
  <p>I then get options to either: <em>"Delete file (ours)"</em>, <em>"Keep modified (theirs)"</em>, or <em>"Keep base file"</em>.</p>
  
  <p>I understand what has happened here and what these options are, but in most cases I don't know how to proceed unless I can see the changes that were made to the file on the branch that I'm merging in. If it was an unimportant change (whitespace / formatting / 'using' statements) then it doesn't matter and I can just keep the deletion, but if they made some more significant changes then I'm going to have to spend some time manually hunting these down and merging them.</p>
  
  <p>Does anyone know of a git command I can run that will show me a diff of base -> remote in this situation? At the moment when this happens I'm going over to my colleague's desk to ask them what changes they made to that file so I can continue with my merge.</p>