Keep path references in merge_file_from_index#520

jdavid merged 1 commit into

libgit2:masterlibgit2/pygit2:masterfrom

cjwatson:merge-index-path-refscjwatson/pygit2:merge-index-path-refsCopy head branch name to clipboard