mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2024-12-28 07:20:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7
jj/.gitattributes

3 lines
96 B
Text
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 05:42:32 +00:00
Cargo.lock linguist-generated=true merge=binary
flake.lock linguist-generated=true merge=binary
Reference in a new issue Copy permalink