diff --git a/nixos/git/home.nix b/nixos/git/home.nix index cb52c5b1..ed93c379 100644 --- a/nixos/git/home.nix +++ b/nixos/git/home.nix @@ -19,6 +19,7 @@ diff.renameLimit = 2048; diff.renames = "copy"; help.autocorrect = 1; + merge.renamelimit = 8192; mergetool.keepBackup = false; pull.ff = "only"; push.default = "simple";