From ed396818c8c40851f538a215ae824363c88298f6 Mon Sep 17 00:00:00 2001
From: Stefan Liebl <Stefan.Liebl@partner.bmw.de>
Date: Tue, 24 Jun 2014 10:38:39 +0200
Subject: [PATCH] improve gvimmerge

Change-Id: Ia6b607be73379819c3a64a3980ba05acf827fa23
---
 vimfiles.stefan/tools/gvimmerge.vim | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/vimfiles.stefan/tools/gvimmerge.vim b/vimfiles.stefan/tools/gvimmerge.vim
index 40d45c1..b91cb4d 100644
--- a/vimfiles.stefan/tools/gvimmerge.vim
+++ b/vimfiles.stefan/tools/gvimmerge.vim
@@ -16,16 +16,22 @@ endfunction
 
 function s:OpenMergeTabs()
     set columns=200
-    call s:OpenDiffTab(1, 4)
+    call s:OpenDiffTab(2, 4)
     call s:FixLineendings()
     setlocal noreadonly modifiable
-    call s:OpenDiffTab(2, 4)
+    call s:OpenDiffTab(1, 4)
     call s:OpenDiffTab(3, 4)
     call s:OpenDiffTab(1, 2)
     call s:OpenDiffTab(1, 3)
     call s:OpenDiffTab(2, 3)
     tabfirst
     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
 
 call s:OpenMergeTabs()