Module Name:	src
Committed By:	tron
Date:		Thu Apr  7 11:37:39 UTC 2005

Modified Files:
	src/bin/sh [netbsd-3]: expand.c

Log Message:
Pull up revision 1.70 (requested by dsl in ticket #119):
Check quoting before merging ifs regions.
sh -c 'set -- a; x="b c"; set -- "$@"$x'
now correctly gives $1=ab, $2=c


To generate a diff of this commit:
cvs rdiff -r1.68.2.1 -r1.68.2.2 src/bin/sh/expand.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.