warning: you may want to set your merge.renamelimit variable to at least x and retry the command.

Increase the merge.renamelimit variable:

git config merge.renameLimit 999999

When done, restore:

git config --unset merge.renameLimit