[illumos-gate merge]release-20200827

commit dbe930bf51e0d7458b24d30e9f25756c5da54ddf
    13040 grep can leverage bmg in more cases
commit 81dd18d87c3c2e198d2178dfd1f30d62a81b69ea
    3546 add support for grep -o option
commit 8ccd021704a4fe1b4022c110d3dd497f8cd907d5
    13038 grep could support --label
commit 2e5ac464a5683c5bf11439ccad74c9f279051820
    13037 grep could support -L
commit f415aa8f1340638644c6cf63e9d11d3767f4cbba
    13036 grep tests could be easier to extend
commit cd94aa947d1e02a1c25259f2cf06c165d75aa4fa
    13061 Import sed tests from freebsd
commit c6fc7f7b786ce47c35645054cdce73e83f39e7f3
    13051 sed: lastline check does not work properly with empty files
commit e0721d5ae1542c80097f6fcd487736fdfe601233
    13003 console: multiple issues related to colors and font loading and switching
commit 6863ede29751efd2be66ec1b48c3c0ee705d7d61
    13066 Want crontab -u
commit 31c9b836861e74f837a36ca29220b58f3657585a
    13044 Clarify parts of getopt_long(3C)
commit 9fff840dca14d75459a8240b19c931e2fec186c5
    13032 printf(3C) should talk about NULL string pointers

	Conflicts:
	usr/src/test/util-tests/tests/grep_xpg4/grep_test.ksh
	usr/src/man/man1/crontab.1
	usr/src/cmd/cron/crontab.c

0 files changed, 0 insertions, 0 deletions