title: git merge: apply changes to code that moved to a different file
body: <p>I am attempting a pretty beefy git merge maneuver right now.  One problem that I am coming across is that I made some changes to some code in my branch, but my colleague moved that code to a new file in his branch.  So when I did <code>git merge my_branch his_branch</code>, git did not notice that the code in the new file was the same as the old, and so none of my changes are there.  </p>
  
  <p>What's the easiest way to go about applying my changes again to the code in the new files.  I won't have too many problems finding out which commits need to be reapplied (I can just use <code>git log --stat</code>).  But as far as I can tell, there is no way to get git to reapply the changes into the new files.  The easiest thing I am seeing right now is to manually reapply the changes, which is not looking like a good idea. </p>
  
  <p>I know that git recognizes blobs, not files, so surely there must be a way to tell it, "apply this exact code change from this commit, except not where it was but where it now is in this new file".</p>