#2 Add join/merge option when renaming dir to existing dir

[padrino]

Would be nice if one would be asked (in addition, one button more ;)) if one not wants to replace the existing dir, but instead merge it's content with the dir to be renmamed.
Containing files with the same name show up with the replace/skip-all type requester.