merge-recursive: adjust git-ls-tree use for the latest.