mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2024-12-24 12:48:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

build: mark Cargo.lock as binary for merging

Browse source 
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`).
This commit is contained in:
Waleed Khan 2022-04-25 22:42:32 -07:00 committed by Martin von Zweigbergk
parent 8744015f33
commit 4948f631d1
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitattributes vendored
View file

@ -1 +1,2 @@
flake.lock linguist-generated=true
Cargo.lock linguist-generated=true merge=binary
flake.lock linguist-generated=true merge=binary