all repos

dotfiles @ ce7b3d1

i use rach linux btw
1 files changed, 5 insertions(+), 0 deletions(-) 
git: use vim as merge tool
Author: Oleksandr Smirnov olexsmir@gmail.com
Committed at: 2025-05-21 16:12:32 +0300
Parent: 671f34b
M gitconfig 
ยทยทยท
        34
        34
         

      
        35
        35
         [merge]

      
        36
        36
             conflictstyle = zdiff3

      
        
        37
        +    tool = nvim-diffview

      
        
        38
        +

      
        
        39
        +[merge "nvim-diffview"]

      
        
        40
        +  cmd = "nvim +DiffviewOpen"

      
        
        41
        +  prompt = false

      
        37
        42
         

      
        38
        43
         [rebase]

      
        39
        44
             autoSquash = true