kacaii.dev / dotfiles
🔒 Backup for my config files
dotfiles
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

add difft as merge tool

Kacaii b3c0c128 c48608fc

+5
+1
.config/fish/shell/abbr.fish
··· 1 1 abbr fcg $EDITOR $__fish_config_dir/config.fish 2 2 abbr tcg $EDITOR $tmux_config_file 3 + abbr jcg $EDITOR $jj_config_file 3 4 4 5 # Default 5 6 abbr c clear
+4
.config/jj/config.toml
··· 26 26 editor = "nvim" 27 27 default-command = "log" 28 28 diff-formatter = ["difft", "--color=always", "$left", "$right"] 29 + diff-tool = "difft" 30 + 31 + [merge-tools.difft] 32 + diff-args = ["--color=always", "--color=always", "$left", "$right"] 29 33 30 34 31 35 [colors]