diff options
| author | Griffin Smith <root@gws.fyi> | 2020-04-02T15·57-0400 |
|---|---|---|
| committer | Griffin Smith <root@gws.fyi> | 2020-04-02T15·57-0400 |
| commit | 74ad2caf32fc35dcb6e7117c4b1b349ed7a7a545 (patch) | |
| tree | 36998ad41d936dcbc871ff2eb267e2c21a4e49a1 | |
| parent | ac2549ce500400ed7ffaefe42a1785a11b2de6fd (diff) | |
git merge conflictstyle diff3
why is this not the default
| -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 871b820094..92632913dc 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"; }; }; |