erwin/nixos-config
1
0
Fork 0
Code Issues 1 Pull requests Projects 1 Releases Wiki Activity Actions
nixos-config/.gitattributes

1 line
24 B
Text
Raw Normal View History

Mark flake.lock as binary for merge conflicts This makes git preserve the local version, but still mark the file as conflicted, so it is not mangled with conflict regions.
2024-01-23 13:40:29 +01:00
/flake.lock merge=binary
Reference in a new issue Copy permalink