Ok, here's the result I'm getting. I don't remember ever making any local changes to defaults.txt, but then again, this has been building for over 12 years now, so who knows? I'd just like to get it resolved. Suggestions please? And thanks again for the help.
art(143)$svn resolve
Merge...