diff --git a/modules/jj.nix b/modules/jj.nix index abe6f59..a256b37 100644 --- a/modules/jj.nix +++ b/modules/jj.nix @@ -10,6 +10,9 @@ default-command = ["log" "--template=log_compact"]; conflict-marker-style = "git"; + + pager = ["sh" "-c" "${pkgs.diff-so-fancy}/bin/diff-so-fancy | less '--tabs=4' -RFX"]; + diff-formatter = ":git"; }; merge-tools = {