diff options
Diffstat (limited to 'git')
-rw-r--r-- | git/.gitconfig | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/git/.gitconfig b/git/.gitconfig index 36eb23c..cf81f16 100644 --- a/git/.gitconfig +++ b/git/.gitconfig @@ -31,11 +31,11 @@ prune = true [advice] detachedHead = false -[diff] -tool = vscode +[merge] +tool = nvimdiff -[difftool "vscode"] -cmd = code --wait --diff $LOCAL $REMOTE +[mergetool "nvimdiff"] +layout = "MERGED" [trailer] separators = ":#" |