mirror of
https://github.com/jj-vcs/jj.git
synced 2026-07-07 17:45:22 +08:00
af4fe21452
I have no idea if we can change the default, but maybe we can conditionally disable the same-change rule to get rid of hacks in squash_commits(), etc.? resolve_file_executable() doesn't respect the Store configuration. I'm not sure if that's the right choice, but it seemed better to accept duplicated change than falling back to executable=false. #6369
5 lines
92 B
TOML
5 lines
92 B
TOML
#:schema ../../../src/config-schema.json
|
|
[merge]
|
|
hunk-level = "line"
|
|
same-change = "accept"
|