Erwin Boskma
cf8e6ee452
This makes git preserve the local version, but still mark the file as conflicted, so it is not mangled with conflict regions.
1 line
24 B
Plaintext
1 line
24 B
Plaintext
/flake.lock merge=binary |