teutat3s/os
2
0
Fork 0
forked from pub-solar/os
Code Pull requests Activity

Fix git mergetool

Browse source
This commit is contained in:
teutat3s 2021-07-20 22:14:24 +02:00
parent f0130f5df7
commit 0b25f7b11b
Signed by: teutat3s
GPG key ID: 4FA1D3FA524F22C1
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
profiles/base-user/.config/git/config.nix
View file

@ -17,7 +17,7 @@ in
cmd = /etc/profiles/per-user/${config.pub-solar.user.name}/bin/nvim -f -c \"Gdiffsplit!\" \"$MERGED\" cmd = /etc/profiles/per-user/${config.pub-solar.user.name}/bin/nvim -f -c \"Gdiffsplit!\" \"$MERGED\"
# set "nvim" as tool for merging # set "nvim" as tool for merging
[merge] [merge]
tool = /etc/profiles/per-user/${config.pub-solar.user.name}/bin/nvim tool = nvim
# automatically launch merge tool without displaying a prompt # automatically launch merge tool without displaying a prompt
[mergetool] [mergetool]
prompt = false prompt = false