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