Can you run merge with the --debug option, and include the line from the log beginning "Tree URLs do not match:" as well?
Can you run merge with the --debug option, and include the line from the log beginning "Tree URLs do not match:" as well?