[Midnightbsd-cvs] src: contrib/less: resolve merge conflict for v436 import

[laffer1 at midnightbsd.org]

Log Message:
-----------
resolve merge conflict for v436 import

Modified Files:
--------------
    src/contrib/less:
        command.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/contrib/less/command.c?r1=1.2&r2=1.3)
        forwback.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/contrib/less/forwback.c?r1=1.2&r2=1.3)
        less.h (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/contrib/less/less.h?r1=1.2&r2=1.3)
        line.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/contrib/less/line.c?r1=1.2&r2=1.3)
        main.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/contrib/less/main.c?r1=1.2&r2=1.3)
        prompt.c (r1.4 -> r1.5)
        (http://cvsweb.midnightbsd.org/src/contrib/less/prompt.c?r1=1.4&r2=1.5)
        screen.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/contrib/less/screen.c?r1=1.2&r2=1.3)
        search.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/contrib/less/search.c?r1=1.2&r2=1.3)
        signal.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/contrib/less/signal.c?r1=1.2&r2=1.3)