Merge remote-tracking branch 'origin/vendor/LIBEDIT'
authorzrj <zrj@dragonflybsd.org>
Tue, 30 Apr 2019 20:44:55 +0000 (23:44 +0300)
committerzrj <zrj@dragonflybsd.org>
Tue, 30 Apr 2019 20:44:55 +0000 (23:44 +0300)
commite1b2cf92364a2a8de3308135714fd3063c8d76db
treeb8443ad51d6c284ff9c564ff40007a16e0bf8f9d
parent7eb1db91206029cc6897303a0117324409644c18
parentae19eda8935c252ce909c17f3060491b0b44c3e1
Merge remote-tracking branch 'origin/vendor/LIBEDIT'

 Conflicts:
contrib/libedit/src/chartype.h
contrib/libedit/src/el.c