Hi, On Sun, Apr 18, 2021 at 01:48:53PM +0200, Arne Schwabe wrote: > > For master, this conflicts with commit 8fa8a17528c (compress migrate), > > which already introduces the "multi" parameter. Master only needs the > > second hunk (documentation plus CAS_SUCCEEDED check). > > I can resend it if you want but this should be a trivial conflict. Maybe > even 3way merge might fix it. If you don't count this as trivial > conflict (i.e. does the same as the other patch) then I can also resend it.
It's a trivial conflict (basically, 2 of 3 hunks are "already in", though
the first looks different due to line wrapping, so 3way can't autofix it).
I basically just wanted to know how to proceed here :-) - so I'll proceed
to merge this to 2.5 "as it is" and to master "only hunk 2".
gert
--
"If was one thing all people took for granted, was conviction that if you
feed honest figures into a computer, honest figures come out. Never doubted
it myself till I met a computer with a sense of humor."
Robert A. Heinlein, The Moon is a Harsh Mistress
Gert Doering - Munich, Germany g...@greenie.muc.de
signature.asc
Description: PGP signature
_______________________________________________ Openvpn-devel mailing list Openvpn-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openvpn-devel
