git-annex automatic merge conflict fix

Browse Source

...

This commit is contained in:

Mateusz Maciejewski

2025-04-22 13:19:03 +02:00

parent 2f44abe21b 85b24e4ce8

commit 69aa7257a0

1 changed files with 0 additions and 0 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

secure-boot/sb_test_data.img → secure-boot/sb_test_data.variant-c589.img