renaming-merge: allow merging from a local branch

Very useful, e.g. when importing .zip files and merging them into
a subdirectory...

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>