ok/jj
1
0
Fork 0
forked from mirrors/jj
Code Pull requests Activity
jj/cli/src/config
History
Martin von Zweigbergk 2ccb17b7b3 cli: enable tree-level conflicts by default 
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`).
2023-10-05 10:31:47 -07:00
..
colors.toml templates: default placeholders to red 2023-08-30 12:54:15 +08:00
merge_tools.toml merge_tools: Allow 3-pane diff editing 2023-08-21 20:19:15 -07:00
misc.toml cli: enable tree-level conflicts by default 2023-10-05 10:31:47 -07:00
README.md cli: move src/ directory to new cli/ directory 2023-08-04 19:00:42 -05:00
revsets.toml cli: make set of immutable commits configurable 2023-09-25 15:41:45 -07:00
templates.toml revset: convert root symbol to function 2023-09-04 10:36:30 +09:00
unix.toml configs: use Notepad as default editor on Windows 2023-08-10 17:09:07 +00:00
windows.toml windows: disable pagination by default (#2040) 2023-08-12 04:37:39 +00:00

README.md

These files are compiled into the binary; they are not installed to the user's system.