1 files changed, 7 insertions, 1 deletions

diff --git a/common/commandline/git.nix b/common/commandline/git.nix
index 0e04358..07b49ad 100644
--- a/common/commandline/git.nix
+++ b/common/commandline/git.nix
@@ -38,13 +38,19 @@ inputs: {
         };
 
         diff = {
+          algorithm = "histogram";
           colormoved = "default";
           colorMovedWS = "allow-indentation-change";
         };
 
         pull.ff = "only";
 
-        merge = {tool = "nvimdiff";};
+        rerere.enable = true;
+
+        merge = {
+          conflictStyle = "zdiff3";
+          tool = "nvimdiff";
+        };
         "mergetool \"nvimdiff\"" = {cmd = "nvim -d \"$LOCAL\" \"$MERGED\" \"$REMOTE\"";};
 
         delta = with config.theme.colors; {