diff options
Diffstat (limited to 'home')
-rw-r--r-- | home/home.nix | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/home/home.nix b/home/home.nix index 871b82009446..92632913dcfd 100644 --- a/home/home.nix +++ b/home/home.nix @@ -79,6 +79,7 @@ let machine = ./machines/chupacabra.nix; in userName = "Griffin Smith"; extraConfig = { github.user = "glittershark"; + merge.conflictstyle = "diff3"; }; }; |