jj/.gitattributes

mirror of https://github.com/martinvonz/jj.git synced 2024-12-01 11:49:01 +00:00
Cargo.lock linguist-generated=true merge=binary
flake.lock linguist-generated=true merge=binary
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`