Remove -merge from Cargo.lock gitattributes #5616

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

youknowone merged 1 commit into RustPython:main from coolreader18:merge-lockfile

Mar 20, 2025

Merged

Remove -merge from Cargo.lock gitattributes #5616

2 .gitattributes

-Original file line number
+Diff line change
@@ -1,5 +1,5 @@
     Lib/**      linguist-vendored
-    Cargo.lock  linguist-generated -merge
+    Cargo.lock  linguist-generated
     *.snap      linguist-generated -merge
     vm/src/stdlib/ast/gen.rs    linguist-generated -merge
     Lib/*.py    text working-tree-encoding=UTF-8 eol=LF
-          Expand Down