this repo has no description
programs.git: remove manual mergiraf tool for jj
+2
-8
+2
-8
modules/programs/git.nix
+2
-8
modules/programs/git.nix
···
1
1
{
2
2
delib,
3
+
lib,
3
4
pkgs,
4
5
...
5
6
}:
···
93
94
conflict-marker-style = "git";
94
95
# diff-formatter = "delta";
95
96
editor = "codium -w";
96
-
merge-editor = "vscodium";
97
+
merge-editor = lib.mkForce "vscodium";
97
98
};
98
99
99
100
revset-aliases = {
···
111
112
tug = ["bookmark" "move" "--from" "closest_bookmark(@-)" "--to" "@-"];
112
113
tug-here = ["bookmark" "move" "--from" "closest_bookmark(@)" "--to" "@"];
113
114
solve = ["resolve" "--tool" "mergiraf"];
114
-
};
115
-
116
-
merge-tools.mergiraf = {
117
-
program = "mergiraf";
118
-
merge-args = ["merge" "$base" "$left" "$right" "-o" "$output"];
119
-
merge-conflict-exit-codes = [1];
120
-
conflict-marker-style = "git";
121
115
};
122
116
123
117
git = {