Stefan Liebl 032cdfc6c9 + gvimmerge: opens a gvim with some tabs to resolve conflicts
Change-Id: I5d797655d5f7f316f25acf13c9e9295fd3599893
2014-06-05 16:14:37 +02:00

32 lines
733 B
VimL

function s:OpenDiffTab(left, right)
tabnew
execute 'buffer' a:left
diffthis
execute 'rightbelow vertical sbuffer' a:right
diffthis
endfunction
function s:FixLineendings()
if !exists('b:reload_dos') && !&binary && &ff=='unix' && (0 < search('\r$', 'nc'))
edit ++ff=dos
echom 'fixed lineendings'
let b:reload_dos = 1
endif
endfunction
function s:OpenMergeTabs()
set columns=200
call s:OpenDiffTab(1, 4)
call s:FixLineendings()
setlocal noreadonly modifiable
call s:OpenDiffTab(2, 4)
call s:OpenDiffTab(3, 4)
call s:OpenDiffTab(1, 2)
call s:OpenDiffTab(1, 3)
call s:OpenDiffTab(2, 3)
tabfirst
tabclose
endfunction
call s:OpenMergeTabs()