- 25 Jan, 2022 1 commit
-
-
yoav-steinberg authored
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.
-
- 10 Oct, 2021 1 commit
-
-
Yoav Steinberg authored
git-subtree-dir: deps/jemalloc git-subtree-split: 886e40bb339ec1358a5ff2a52fdb782ca66461cb
-