How to merge two branches with different directory hierarchies in git?

Try setting merge.renameLimit to something high for this merge. git tries to detect renames, but only if the number of files is below this limit, since it requires O(n^2) processing time:

git config merge.renameLimit 999999

then when done:

git config --unset merge.renameLimit