27
27
(e.g. from a merge) to the master branch (and informs the user if there
28
28
is a conflict). (Andrew Bennetts, #603395)
31
31
with stricter web frameworks. (Vincent Ladeuil, #655100)
33
33
* ``NotBranchError`` no longer allows errors from calling