Closed mshinwell closed 1 month ago
Conflict resolution and fixes for driver/ and ocaml/driver/.
driver/
ocaml/driver/
I'm unsure about the changes required to makedepend.ml; I took what we have on flambda-backend/main, but this may not be correct. @Forestryks probably needs to help.
makedepend.ml
flambda-backend/main
I think I've got the resolution correct now, c.f.:
5.1.1..5.2.0
5.1.1
@xclerc please have a look
Conflict resolution and fixes for
driver/
andocaml/driver/
.I'm unsure about the changes required to
makedepend.ml
; I took what we have onflambda-backend/main
, but this may not be correct. @Forestryks probably needs to help.