Fix: properly load content from preferences in merge screen

Browse Source

...

This commit is contained in:

xiaji

2026-03-06 22:45:54 +08:00

parent 16a32f6367

commit a4d2e67fd6

82 changed files with 18 additions and 8 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

BIN

.gradle/8.2/executionHistory/executionHistory.bin

Binary file not shown.

BIN

.gradle/8.2/executionHistory/executionHistory.lock

Binary file not shown.