yoav-steinberg d26453a3f8 Fix commands.c build issue on merge (#10172) ...

Set commands.c's merge driver to binary so when it conflicts during a merge git will leave the local version unmodified.
This way our Makefile will rebuild it based on src/commands/*.json before trying to compile it.
Otherwise the file gets modified with merge conflict markers and gets the same timestamp as the *.json files,
so the Makefile doesn't attempt to rebuild it before compiling and we get a compilation error.

2022-01-25 12:24:06 +02:00

405 B

Raw Blame History

View Raw