diff options
Diffstat (limited to 'git/.gitconfig')
| -rw-r--r-- | git/.gitconfig | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/git/.gitconfig b/git/.gitconfig deleted file mode 100644 index ff10baa..0000000 --- a/git/.gitconfig +++ /dev/null @@ -1,21 +0,0 @@ -[user] - name = Miguel - email = m.i@gmx.at - -[merge] - tool = vimdiff - conflictstyle = diff3 - -[mergetool] - prompt = true - -[mergetool "vimdiff"] - cmd = nvim -d $BASE $LOCAL $REMOTE $MERGED -c '$wincmd w' -c '$wincmd w' -c '$wincmd w' -c '$wincmd J' - -[diff] - tool = nvimdiff - -[difftool "nvimdiff"] - cmd = "/root/nvim.appimage -d $LOCAL $REMOTE" - prompt = true - |