mirror of
https://github.com/martinvonz/jj.git
synced 2025-01-16 17:19:37 +00:00
2ccb17b7b3
I have used the tree-level conflict format for several weeks without
problem (after the fix in 51b5d168ae). Now - right after the 0.10.0
release - seems like a good time to enable the config by default.
I enabled the config in our default configs in the CLI crate to reduce
impact on tests (compared to changing the default in `settings.rs`).
13 lines
234 B
TOML
13 lines
234 B
TOML
[aliases]
|
|
# Placeholder: added by user
|
|
|
|
[format]
|
|
tree-level-conflicts = true
|
|
|
|
[ui]
|
|
paginate = "auto"
|
|
pager = { command = ["less", "-FRX"], env = { LESSCHARSET = "utf-8" } }
|
|
log-word-wrap = false
|
|
|
|
[snapshot]
|
|
max-new-file-size = "1MiB"
|