Re: Fix for vertical table border for added column

[Kornel Benko]

Am Samstag, 19. August 2017 um 13:14:26, schrieb Jean-Marc Lasgouttes 
<lasgout...@lyx.org>
> Le 19 août 2017 10:31:25 GMT+02:00, Kornel Benko <kor...@lyx.org> a écrit :
> >
> >Thanks for the hint Jean-Marc.
> >
> >Using "git am", I get:
> >     Applying: Fix for double lines created by "set all lines" and "set
> >border lines".
> >     error: patch failed: src/insets/InsetTabular.cpp:5781
> >     error: src/insets/InsetTabular.cpp: patch does not apply
> >     Patch failed at 0001 Fix for double lines created by "set all lines"
> >and "set border lines".
> >     The copy of the patch that failed is found in:
> >        /usr2/src/lyx/lyx-git/.git/rebase-apply/patch
> >     When you have resolved this problem, run "git am --continue".
> >     If you prefer to skip this patch, run "git am --skip" instead.
> >     To restore the original branch and stop patching, run "git am
> >--abort".
> >
> >Using --ignore-space-change and --ignore-whitespace does not help.
> >
> >     Kornel
> 
> And what about the -3 option?
> 
> JMarc

Not better:
        Applying: Fix for double lines created by "set all lines" and "set 
border lines".
        fatal: sha1 information is lacking or useless 
(src/insets/InsetTabular.cpp).
        Repository lacks necessary blobs to fall back on 3-way merge.
        Cannot fall back to three-way merge.
        Patch failed at 0001 Fix for double lines created by "set all lines" 
and "set border lines".
        The copy of the patch that failed is found in:
           /usr2/src/lyx/lyx-git/.git/rebase-apply/patch

I prefer to wait for a new patch.

        Kornel

signature.asc
Description: This is a digitally signed message part.