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)
 Conflicts:
contrib/libedit/src/chartype.h

1  2 
contrib/libedit/src/el.c

Simple merge