diff options
Diffstat (limited to 'git')
| -rw-r--r-- | git/.gitconfig | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/git/.gitconfig b/git/.gitconfig index 4d656b1..ff10baa 100644 --- a/git/.gitconfig +++ b/git/.gitconfig @@ -1,23 +1,21 @@ -# This is Git's per-user configuration file. [user] -# Please adapt and uncomment the following lines: 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' - -[difftool] - prompt = false - -[diff] - tool = vimdiff +[diff] + tool = nvimdiff + +[difftool "nvimdiff"] + cmd = "/root/nvim.appimage -d $LOCAL $REMOTE" + prompt = true |