Ilya Grigoriev
b6eb00d5ff
docs/config.toml: update the default diff editor
...
It's been changed to `:builtin` some time ago.
2023-10-25 13:05:04 -07:00
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
Martin von Zweigbergk
a367f13c72
configs: use Notepad as default editor on Windows
2023-08-10 17:09:07 +00:00
Ilya Grigoriev
bb6bad18ad
Update docs/config.toml with new way to show relative timestamps
2023-02-15 21:26:14 -08:00
Ilya Grigoriev
8222ba94cf
Documentation for jj resolve and merge tool config
2022-12-03 15:12:40 -08:00
Ilya Grigoriev
52fadc046e
Miscellaneous improvements to config docs
...
Also moves the "relative timestamps" section to make merge tool
docs fit in better.
2022-11-29 20:55:11 -08:00
Ruben Slabbert
01817e4321
feature: support relative timestamps as a config option
2022-11-27 08:35:17 +10:00
iain barnett
980004e908
Added barebones config template with the odd alternative commented out.
2022-07-16 21:28:40 -07:00
