mirror of
https://github.com/martinvonz/jj.git
synced 2024-11-28 17:41:14 +00:00
4948f631d1
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`).
2 lines
96 B
Text
2 lines
96 B
Text
Cargo.lock linguist-generated=true merge=binary
|
|
flake.lock linguist-generated=true merge=binary
|