[user] name = Michal Idziorek 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 [pager] diff = delta show = delta log = delta reflog = delta [interactive] diffFilter = delta --color-only