feat(jujutsu): adapt jj config for vc-jj.el in Emacs
This commit is contained in:
@@ -57,12 +57,15 @@ in {
|
|||||||
inherit (cfg) name email;
|
inherit (cfg) name email;
|
||||||
};
|
};
|
||||||
ui = {
|
ui = {
|
||||||
|
inherit (cfg) editor;
|
||||||
default-command = "st";
|
default-command = "st";
|
||||||
pager = ":builtin";
|
pager = ":builtin";
|
||||||
show-cryptographic-signatures = true;
|
show-cryptographic-signatures = true;
|
||||||
diff-editor = ":builtin";
|
diff-editor = ":builtin";
|
||||||
merge-editort = ":builtin";
|
merge-editort = ":builtin";
|
||||||
inherit (cfg) editor;
|
# These are for vc-jj.el in Emacs
|
||||||
|
diff-formatter = ":git";
|
||||||
|
conflict-marker-style = "git";
|
||||||
};
|
};
|
||||||
signing = mkIf cfg.signing.enable {
|
signing = mkIf cfg.signing.enable {
|
||||||
behavior = "own";
|
behavior = "own";
|
||||||
|
|||||||
Reference in New Issue
Block a user