Fix git mergetool

2021-07-20 22:14:24 +02:00 · 2021-07-20 22:14:24 +02:00 · 0b25f7b11b
parent f0130f5df7
commit 0b25f7b11b
1 changed files with 1 additions and 1 deletions
--- a/profiles/base-user/.config/git/config.nix
+++ b/profiles/base-user/.config/git/config.nix
@ -17,7 +17,7 @@ in
  cmd = /etc/profiles/per-user/${config.pub-solar.user.name}/bin/nvim -f -c \"Gdiffsplit!\" \"$MERGED\"
 # set "nvim" as tool for merging
 [merge]
-  tool = /etc/profiles/per-user/${config.pub-solar.user.name}/bin/nvim
+  tool = nvim
 # automatically launch merge tool without displaying a prompt
 [mergetool]
  prompt = false