fix number of | in merge base is increased when conflict is nested

rhysd · Sep 21, 2020 · 0ada2b9 · 0ada2b9
1 parent 11819f4
commit 0ada2b9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/plugin/conflict_marker.vim b/plugin/conflict_marker.vim
@@ -11,7 +11,7 @@ endfunction
 
 call s:var('highlight_group', 'Error')
 call s:var('begin', '^<<<<<<<')
-call s:var('common_ancestors', '^||||||| .*$')
+call s:var('common_ancestors', '^|||||||')
 call s:var('separator', '^=======$')
 call s:var('end', '^>>>>>>>')
 call s:var('enable_mappings', 1)

diff --git a/t/matchit_spec.vim b/t/matchit_spec.vim
@@ -40,7 +40,7 @@ describe 'matchit'
 
     it 'defines b:match_words'
         Expect 'b:match_words' to_exist
-        Expect b:match_words =~# ',^<<<<<<<:^||||||| .*$:^=======$:^>>>>>>>'
+        Expect b:match_words =~# ',^<<<<<<<:^|||||||:^=======$:^>>>>>>>'
     end
 
     it 'can jump within a conflict marker'
@@ -71,7 +71,7 @@ describe 'matchit with diff3'
 
     it 'defines b:match_words'
         Expect 'b:match_words' to_exist
-        Expect b:match_words =~# ',^<<<<<<<:^||||||| .*$:^=======$:^>>>>>>>'
+        Expect b:match_words =~# ',^<<<<<<<:^|||||||:^=======$:^>>>>>>>'
     end
 
     it 'can jump within a conflict marker'