diff options
| author | sefidel <contact@sefidel.net> | 2024-08-28 21:53:35 +0900 |
|---|---|---|
| committer | sefidel <contact@sefidel.net> | 2024-09-04 20:46:56 +0900 |
| commit | 5d7ac0e061e7f2ba2acfb3b813c5e82e30590bc7 (patch) | |
| tree | 0ff55281de28408dc2a0c852594b5a838b15158a /home/profiles/development | |
| parent | 32589efd38f4a767b68658c272b56f2ec1cb64e2 (diff) | |
| download | nixrc-5d7ac0e061e7f2ba2acfb3b813c5e82e30590bc7.tar.gz nixrc-5d7ac0e061e7f2ba2acfb3b813c5e82e30590bc7.zip | |
feat(home/development): git: switch to zdiff3
Diffstat (limited to 'home/profiles/development')
| -rw-r--r-- | home/profiles/development/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/home/profiles/development/default.nix b/home/profiles/development/default.nix index 15cec65..71cf3af 100644 --- a/home/profiles/development/default.nix +++ b/home/profiles/development/default.nix @@ -41,7 +41,7 @@ in init.defaultBranch = "main"; pull.rebase = true; - merge.conflictStyle = "diff3"; + merge.conflictStyle = "zdiff3"; mergetool.fugitive = { cmd = ''nvim -f -c "Gvdiffsplit!" "$MERGED"''; |