xesc/gitconfig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add better mergetool options

Browse source
This commit is contained in:
xesc 2025-02-27 19:27:34 +01:00
parent 618a5a8a6f
commit ddc13e5bee
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
config
View file

@ -14,12 +14,15 @@
prompt = false prompt = false
[merge] [merge]
tool = nvimdiff2 tool = nvimdiff
[mergetool] [mergetool]
keepBackup = false keepBackup = false
prompt = false prompt = false
[mergetool "nvimdiff"]
layout = "LOCAL,MERGED,REMOTE + LOCAL,BASE,REMOTE / MERGED + LOCAL, REMOTE + MERGED + BASE, MERGED"
[include] [include]
path = ~/.config/.gitlocalconfig path = ~/.config/.gitlocalconfig