[user] name = "Oliver Jan Krylow" email = "oliver@bugabinga.net" [ui] default-command = "log" editor = "neovide --no-fork" merge-editor = "vide" [merge-tools.vide] program = "neovide" merge-args = [ "--wayland_app_id", "neovide_diff", "--no-fork", "--no-tabs", "--", "-d", "$left", "$output", "$right", "$base", "-c", "set hidden diffopt=filler,closeoff,internal,algorithm:histogram,linematch:60", "-c", "filetype plugin indent on | syntax on", "-c", "windo let &l:syntax=&l:filetype | setlocal nowrap cursorline nofoldenable", "-c", "wincmd t | let g:jj_left=bufnr('%') | setlocal readonly nomodifiable winbar=LEFT | wincmd w | let g:jj_output=bufnr('%') | setlocal modifiable noreadonly winbar=OUTPUT | wincmd w | let g:jj_right=bufnr('%') | setlocal readonly nomodifiable winbar=RIGHT | wincmd w | let g:jj_base=bufnr('%') | setlocal readonly nomodifiable winbar=BASE | hide | wincmd t | wincmd w", "-c", "nnoremap l :execute 'diffget ' . g:jj_left", "-c", "nnoremap r :execute 'diffget ' . g:jj_right", "-c", "nnoremap b :execute 'vertical sbuffer ' . g:jj_base:diffthis", ] merge-tool-edits-conflict-markers = true [aliases] rem = ["resolve", "--tool", "mergiraf"] ren = ["resolve", "--tool", "vide"]