stefan/vimsuite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

improve gvimmerge

Browse Source 
Change-Id: Ia6b607be73379819c3a64a3980ba05acf827fa23
This commit is contained in:
Stefan Liebl 2014-06-24 10:38:39 +02:00
parent 032cdfc6c9
commit ed396818c8
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
vimfiles.stefan/tools/gvimmerge.vim
View File

@ -16,16 +16,22 @@ endfunction
function s:OpenMergeTabs() function s:OpenMergeTabs()
set columns=200 set columns=200
call s:OpenDiffTab(1, 4) call s:OpenDiffTab(2, 4)
call s:FixLineendings() call s:FixLineendings()
setlocal noreadonly modifiable setlocal noreadonly modifiable
call s:OpenDiffTab(2, 4) call s:OpenDiffTab(1, 4)
call s:OpenDiffTab(3, 4) call s:OpenDiffTab(3, 4)
call s:OpenDiffTab(1, 2) call s:OpenDiffTab(1, 2)
call s:OpenDiffTab(1, 3) call s:OpenDiffTab(1, 3)
call s:OpenDiffTab(2, 3) call s:OpenDiffTab(2, 3)
tabfirst tabfirst
tabclose tabclose
" turn off line formatting
setlocal formatoptions=
" set search pattern to conflict markers
let @/ = "[<>=]\\{7}"
" set last command to 'save and close'
call histadd('cmd', 'w | qa')
endfunction endfunction
call s:OpenMergeTabs() call s:OpenMergeTabs()