Module Name:	src
Committed By:	kleink
Date:		Sun May 11 08:06:01 UTC 2003

Modified Files:
	src/bin/ls: ls.c

Log Message:
If both -g and -l options are present, let -l take precedence over -g,
as requested by several users.

POSIX-2001 is unclear on conflicting option letters as far as the -g
option is concerned; a clarification request will be made.

Addresses PR bin/21519 by Geoff Wing.


To generate a diff of this commit:
cvs rdiff -r1.47 -r1.48 src/bin/ls/ls.c

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