From 0b25f7b11b35abdaf723ccc18474c3dfdd905c88 Mon Sep 17 00:00:00 2001 From: teutat3s Date: Tue, 20 Jul 2021 22:14:24 +0200 Subject: [PATCH] Fix git mergetool --- profiles/base-user/.config/git/config.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/profiles/base-user/.config/git/config.nix b/profiles/base-user/.config/git/config.nix index 6b099f87..eaa4271b 100644 --- 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