feat: use mergiraf

Signed-off-by: Lander Van den Bulcke <landervandenbulcke@gmail.com>

home/lander/features/cli/git/default.nix

@@ -61,6 +61,9 @@ in
 
       # sign your commits!
       commit.gpgsign = true;
+
+      # diff3 merge
+      merge.conflictStyle = "diff3";
     };
 
     # This is optional, as `git identity` will call the `git-identity` script by itself, however
@@ -76,4 +79,7 @@ in
       enableAsDifftool = true;
     };
   };
+
+  # use mergiraf
+  programs.mergiraf.enable = true;
 }