modify gitconfig

2022-05-03 15:55:34 +08:00 · 2022-05-03 15:55:34 +08:00 · a0d0f7b1a2
parent a37ceaed83
commit a0d0f7b1a2
1 changed files with 3 additions and 1 deletions
--- a/4
+++ b/4
@ -9,7 +9,7 @@
  tool = vimdiff
  trustExitCode = true
 [difftool]
-  prompt = false
+  prompt = true
 [alias]
  d = difftool
  co = checkout
@ -20,6 +20,8 @@
  br = branch
 [mergetool]
 	keepBackup = false
+[mergetool "vimdiff"]
+  cmd = nvim -d $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
 [core]
  editor = vim