How do I move diff contents of one file to another (in git)?
<p>I'm having an issue upon merging to master in git.
A file that I was working on in my local branch (old.file) has been moved and renamed in master (to new.file).
After merging master into my branch I now have the new file and working changes on the old file.</p>

<p>How do I move changed contents of old.file into new.file?
I only want to move the 20-something changed lines of old.file into new.file and then delete old.file.</p>