mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

git merge conflictstyle diff3

Browse source 
why is this not the default
This commit is contained in:
Griffin Smith 2020-04-02 11:57:18 -04:00
parent ac2549ce50
commit 74ad2caf32
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
home/home.nix
View file

@ -79,6 +79,7 @@ let machine = ./machines/chupacabra.nix; in
userName = "Griffin Smith"; userName = "Griffin Smith";
extraConfig = { extraConfig = {
github.user = "glittershark"; github.user = "glittershark";
merge.conflictstyle = "diff3";
}; };
}; };