fix: refine conflict merge policy

Browse Source

...

This commit is contained in:

vorotamoroz

2026-07-07 11:29:51 +00:00

parent 0c58b0c513

commit 8046a777af

2 changed files with 15 additions and 1 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

src/lib

+1 -1

Submodule src/lib updated: be43ca7686...6bba9fd237