title: How to make Git understand that moved file and edited file is the same file?
body: <p>I have 2 branches. In first file named index.html is edited and commited. In second this file edited and moved to other folder. 
    Can I make GIT understand (while merging) that index.html from 1st branch is the same file "folder/index.html" form second branch. In my opinion the problem is that when I moved file into a new folder GIT first deleted it and then created it in new folder. 
    So after merging I will have 1 file with both changes?</p>