Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Bob Williams 2014-03-23 14:26:06 -04:00
commit 1ca4e2146b

View File

@ -8,5 +8,6 @@ GREP_OPTIONS=
for PATTERN in .cvs .git .hg .svn; do
GREP_OPTIONS+="--exclude-dir=$PATTERN "
done
export GREP_OPTIONS+='--color=auto '
GREP_OPTIONS+="--color=auto"
export GREP_OPTIONS="$GREP_OPTIONS"
export GREP_COLOR='1;32'