merge trees into a git_merge_index
strict renames in tree merges