Set conflict style to diff3
This commit is contained in:
parent
b28f3ffd9c
commit
9d9c94c5ed
|
@ -67,6 +67,7 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
extraConfig = {
|
extraConfig = {
|
||||||
|
merge.conflictStyle = "diff3";
|
||||||
pull.ff = "only";
|
pull.ff = "only";
|
||||||
core.editor = "vim";
|
core.editor = "vim";
|
||||||
init.defaultBranch = "main";
|
init.defaultBranch = "main";
|
||||||
|
|
Loading…
Reference in a new issue