merge-recursive: fix longstanding bug in merging symlinks