FIND_RENAMES

detect renames that occur between the common ancestor and the "ours" side or the common ancestor and the "theirs" side.

This will enable the ability to merge between a modified and renamed file.