just playing with tangled
at ig/vimdiffwarn 33 lines 1.1 kB view raw
1# Basic template of config settings 2 3# Don't forget to change these to your own details! 4user.name = "YOUR NAME" 5user.email = "YOUR_EMAIL@example.com" 6 7ui.color = "auto" # the default 8# ui.color = never # no color 9 10ui.editor = "pico" # the default on Unix 11# ui.editor = "vim" 12 13ui.diff-editor = ":builtin" # default, internal TUI tool 14# ui.diff-editor = "meld" 15# ui.diff-editor = "vimdiff" 16 17ui.merge-editor = "meld" # default 18# ui.merge-editor = "vscode" 19# ui.merge-editor = "vimdiff" 20# ui.merge-editor = "kdiff3" 21 22# Relative timestamp rendered as "x days/hours/seconds ago" 23template-aliases.'format_timestamp(timestamp)' = 'timestamp.ago()' 24 25# The four merge tools listed above are pre-configured. For detailed information 26# about how to change the default configuration or how to configure another tool, 27# see documentation in config.md. An example: 28 29# merge-tools.meld.program = "C:\\Program Files\\Meld\\meld.exe" # If not in PATH 30 31# Change the default push/fetch remote for `jj git push` and `jj git fetch` 32# git.fetch = "upstream" 33# git.push = "myfork"