git: Merge remote-tracking branch 'origin/vendor/LIBEDIT'

Tue Apr 30 10:57:40 PDT 2019

commit 30baa437bb9bd1152f19689c2d0442f652174e87
Merge: 02aa41ec25 12db70c866
Author: zrj <zrj at dragonflybsd.org>
Date:   Tue Apr 30 20:59:56 2019 +0300

    Merge remote-tracking branch 'origin/vendor/LIBEDIT'

     Conflicts:
    	contrib/libedit/src/chartype.h
    	contrib/libedit/src/eln.c
    	contrib/libedit/src/filecomplete.c
    	contrib/libedit/src/sys.h

Summary of changes:

http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/30baa437bb9bd1152f19689c2d0442f652174e87

-- 
DragonFly BSD source repository