[6.40] Fix off-by-one error for merging nested directories - #23882

[6.40] Fix off-by-one error for merging nested directories#23882

enirolf merged 3 commits into

root-project:v6-40-00-patchesroot-project/root:v6-40-00-patchesfrom

root-project-bot:BP_6.40_pull_23878root-project-bot/root:BP_6.40_pull_23878Copy head branch name to clipboard