Yuya Nishihara af4fe21452 files, tree: make same-change conflict resolution configurable ... 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		2025-09-11 13:14:28 +00:00
..
colors_hex.toml
diff.toml
empty.toml
experimental-advance-branches.toml
fix.toml
fix.tools.command_command-env.toml	config-schema: allow "command-env"-style for editors and fix tools	2025-04-24 15:48:08 +00:00
fix.tools.command_string.toml	config-schema: allow "command-env"-style for editors and fix tools	2025-04-24 15:48:08 +00:00
fsmonitor.backend_none.toml	config: move fsmonitor settings out of core	2025-07-21 03:38:34 +00:00
fsmonitor.backend_watchman.toml	config: move fsmonitor settings out of core	2025-07-21 03:38:34 +00:00
git.toml	cli: git-push: make "change" bookmark names templated	2025-07-02 01:55:59 +00:00
merge-tools_exotic.toml
merge.toml	files, tree: make same-change conflict resolution configurable	2025-09-11 13:14:28 +00:00
operation.toml
revsets.short-prefixes.toml
scope.toml	config-schema: add --when and --scope keys	2025-08-30 21:31:39 +00:00
signing_ssh.toml	ssh-signing: add revocation-list option	2025-07-29 12:46:36 +00:00
snapshot.max-new-file-size_numeric.toml
toplevel_when.toml	config-schema: add --when and --scope keys	2025-08-30 21:31:39 +00:00
ui.default-command_empty_array.toml	config-schema: deny empty arrays for command-like config options	2025-04-24 15:48:08 +00:00
ui.pager_command-env_array.toml
ui_command-env.toml	cli: unify diff format/tool config variables	2025-05-16 00:33:49 +00:00
ui_multi_arg_cmds.toml	cli: unify diff format/tool config variables	2025-05-16 00:33:49 +00:00
ui_simple.toml	cli: unify diff format/tool config variables	2025-05-16 00:33:49 +00:00
user.toml