Resolve merge conflicts by keeping local changes

Browse Source

...

This commit is contained in:

Mandy

2026-07-25 21:13:56 +02:00

parent e8f88cceac a4a446d8d2

commit b9c3ac3a25

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

Diff Content Not Available