diff options
| author | Miguel <m.i@gmx.at> | 2019-06-09 15:00:23 +0200 |
|---|---|---|
| committer | Miguel <m.i@gmx.at> | 2019-06-09 15:00:23 +0200 |
| commit | 5f6d0202ec3250d1fce06f63d7a087e435c0d74c (patch) | |
| tree | 49ba3c3ff9dcec70141181052c298d66679e04a4 /git | |
| parent | 0dd6902c41db20adcf5e6710c2e44f426d4b9644 (diff) | |
updates
Diffstat (limited to 'git')
| -rw-r--r-- | git/.gitconfig | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/git/.gitconfig b/git/.gitconfig index 58dcb03..4d656b1 100644 --- a/git/.gitconfig +++ b/git/.gitconfig @@ -3,3 +3,21 @@ # 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 + + |