This commit is contained in:
parent
0422859f85
commit
b44ee6cebf
3 changed files with 119 additions and 0 deletions
|
|
@ -46,5 +46,25 @@ in
|
|||
};
|
||||
};
|
||||
};
|
||||
|
||||
programs.jujutsu = lib.mkIf cfg.jujutsu.enable {
|
||||
settings = {
|
||||
merge-tools = {
|
||||
delta = {
|
||||
# Errors are signaled with exit codes greater or equal to 2
|
||||
diff-expected-exit-codes = [ 0 1 ];
|
||||
};
|
||||
};
|
||||
|
||||
ui = {
|
||||
diff = {
|
||||
# Delta expects a `git diff` input
|
||||
format = "git";
|
||||
};
|
||||
|
||||
pager = "delta";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue