mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-01-16 09:11:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7
jj/cli/src/config
History
Ilya Grigoriev fcd02a6091 merge_tools.toml: add VS Code as a default merge tool. 
Thanks to @glencbz for noticing that VS Code works fine now as a
merge tool, and thanks to @solson for suggesting
`merge-tool-edits-conflict-markers = true`.
2023-10-25 12:47:51 -07:00
..
colors.toml templates: default placeholders to red 2023-08-30 12:54:15 +08:00
merge_tools.toml merge_tools.toml: add VS Code as a default merge tool. 2023-10-25 12:47:51 -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 cli templates: include hidden (AKA abandoned) status in short commit template 2023-10-24 12:37:26 -07: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.