If I see this correctly, the commit history should be like this:
1b724d6 - worked on Jeroens comments
e8cd46b - Merge branch 'develop' into 
t/25742/change_c_variables_to_64bit_in_booleanfunction_cython_code

so the merge commit
2d7915a - Merge branch 'u/asante/sbox_boomerang_uniformity' of 
git://trac.sagemath.org/sage into 
t/25742/change_c_variables_to_64bit_in_booleanfunction_cython_code
needs to be undone.

Am Samstag, 24. November 2018 12:41:36 UTC+1 schrieb Friedrich Wiemer:
>
> In https://trac.sagemath.org/ticket/25742#comment:13 I accidentally 
> merged the ticket branch forom #25766 
> <https://trac.sagemath.org/ticket/25766>.
> Can someone help and tell me how to undo this? :/
>

-- 
You received this message because you are subscribed to the Google Groups 
"sage-devel" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to sage-devel+unsubscr...@googlegroups.com.
To post to this group, send email to sage-devel@googlegroups.com.
Visit this group at https://groups.google.com/group/sage-devel.
For more options, visit https://groups.google.com/d/optout.

Reply via email to