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
