feat(jujutsu): compatibility with jj-vc.el in Emacs
This commit is contained in:
parent
f6ecefbd91
commit
0d97edd9d9
@ -45,6 +45,9 @@ in {
|
|||||||
default-command = "st";
|
default-command = "st";
|
||||||
pager = ":builtin";
|
pager = ":builtin";
|
||||||
show-cryptographic-signatures = true;
|
show-cryptographic-signatures = true;
|
||||||
|
conflict-marker-style = "git"; # Support for vc-jj.el
|
||||||
|
diff-formatter = ":git"; # Support for vc-jj.el
|
||||||
|
diff-editor = ":builtin";
|
||||||
inherit (cfg) editor;
|
inherit (cfg) editor;
|
||||||
};
|
};
|
||||||
signing = mkIf cfg.signing.enable {
|
signing = mkIf cfg.signing.enable {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user