Commit 4af619c
Changed files (1)
.gitattributes
@@ -1,2 +1,5 @@
# Disable Git line ending conversion, to prevent packwiz index hashes changing when committing from Windows
* -text
+
+# Fix conflicts when rebase/amend
+/index.toml merge=ours