Thanks, but it'd be better to solve this problem somewhere other in the diff3 source code; I'd rather not have #ifdefs like that in the application code. Perhaps the gnulib sh-quote module would be a better place?
http://www.gnu.org/s/gnulib/MODULES.html#module=sh-quote
