merge-recursive: use "up-to-date" instead of "uptodate" in error message for consistency