add missing files, update workspace hack

2026-09-08 06:19:13 +00:00 · 2022-04-14 20:41:21 +03:00
parent 93e0ac2b7a
commit 2cb39a1624
4 changed files with 21 additions and 9 deletions
@@ -0,0 +1,4 @@
+# Avoid putting conflict markers in the generated Cargo.toml file, since their presence breaks
+# Cargo.
+# Also do not check out the file as CRLF on Windows, as that's what hakari needs.
+Cargo.toml merge=binary -crlf