diff --git a/src/testdir/test_cmdline.vim b/src/testdir/test_cmdline.vim index d600552a4a..614411b501 100644 --- a/src/testdir/test_cmdline.vim +++ b/src/testdir/test_cmdline.vim @@ -4354,8 +4354,6 @@ func Test_redrawtabpanel_error() call assert_fails(':redrawtabpanel', 'E1547:') endfunc -<<<<<<< HEAD -<<<<<<< HEAD " Test wildcharm completion for '/' and '?' search func Test_search_complete() CheckOption incsearch