Merging in Unity Version Control is even better. The merge engine in Version Control can deal with moves and renames that make Git break. Unity Version Control includes its own diff and merge tools, too.