diff options
| -rw-r--r-- | home/profiles/development/default.nix | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/home/profiles/development/default.nix b/home/profiles/development/default.nix index 4202f53..aaf7878 100644 --- a/home/profiles/development/default.nix +++ b/home/profiles/development/default.nix @@ -37,7 +37,6 @@ in init.defaultBranch = "main"; pull.rebase = true; - merge.conflictStyle = "diff3"; merge.tool = "nvimdiff"; mergetool.prompt = false; }; |