This needs to work on Windows to merge. What issues do you have with symlinks on Windows? What version of Windows?