this repo has no description
feat(jj): add editor options
+4
+4
modules/programs/git.nix
+4
modules/programs/git.nix
···
90
90
show-cryptographic-signatures = true;
91
91
conflict-marker-style = "git";
92
92
diff-formatter = "delta";
93
+
editor = "codium -w";
94
+
merge-editor = "vscodium";
93
95
};
94
96
95
97
revset-aliases = {
···
108
110
merge-tools.mergiraf = {
109
111
program = "mergiraf";
110
112
merge-args = ["merge" "$base" "$left" "$right" "-o" "$output"];
113
+
merge-conflict-exit-codes = [1];
114
+
conflict-marker-style = "git";
111
115
};
112
116
113
117
git = {