1 files changed, 1 insertions, 0 deletions

diff --git a/users/gkleen/default.nix b/users/gkleen/default.nix
index 074d4866..b018aa85 100644
--- a/users/gkleen/default.nix
+++ b/users/gkleen/default.nix
@@ -61,6 +61,7 @@
             autoStash = true;
             updateRefs = true;
           };
+          merge.conflictstyle = "zdiff3";
         };
       };