merge-recursive: Fix support for branch names containing slashes