martinvonz/jj
1
1
Fork 0
mirror of https://github.com/martinvonz/jj.git synced 2024-09-21 18:58:03 +03:00
Code Issues Packages Projects Releases Wiki Activity
a2b4bd239f
jj/.gitattributes

3 lines
96 B
Plaintext
Raw Normal View History

build: mark `Cargo.lock` as `binary` for merging Otherwise, Git tries to resolve the conflict textually and introduces conflict markers, which make `cargo` unable to process the file (and therefore unable to resolve the conflicts automatically, such as with `cargo update`).
2022-04-26 08:42:32 +03:00
Cargo.lock linguist-generated=true merge=binary
flake.lock linguist-generated=true merge=binary
Reference in New Issue Copy Permalink