fix test case descriptions

test/test_default.vimspec

@@ -1,5 +1,5 @@
 Describe Default settings
-    It provide variables to customize
+    It provides variables to customize
         Assert Exists('g:loaded_conflict_marker')
         Assert Equals(g:conflict_marker_highlight_group, 'Error')
         Assert Equals(g:conflict_marker_begin, '^<<<<<<<\+')
@@ -63,7 +63,7 @@ Describe Default settings
             Assert NotEmpty(mapcheck('cB', 'n'))
         End
 
-        It does not provide user mappings until hunk is not found
+        It does not provide user mappings until hunk is found
             Assert Falsy(mapcheck(']x', 'n'))
             Assert Falsy(mapcheck('[x', 'n'))
             Assert Falsy(mapcheck('ct', 'n'))

test/test_hooks.vimspec

@@ -27,7 +27,7 @@ Describe g:conflict_marker_hooks
         doautocmd BufReadPost
     End
 
-    It execute on_detected hook specified by string
+    It executes on_detected hook specified by string
         let g:test_hooked = 0
         function! TestHook()
             let g:test_hooked = 1
@@ -39,7 +39,7 @@ Describe g:conflict_marker_hooks
         unlet g:test_hooked
     End
 
-    It execute on_detected hook specified by funcref
+    It executes on_detected hook specified by funcref
         let g:test_hooked = 0
         let g:conflict_marker_hooks = {}
         function! g:conflict_marker_hooks.on_detected()

test/test_jump.vimspec

@@ -92,7 +92,7 @@ Describe :ConflictMarkerNextHunk
             close!
         End
 
-        It move cursor to next hunk
+        It moves cursor to next hunk
             normal! gg
             for l in [2, 9, 16]
                 ConflictMarkerNextHunk
@@ -112,7 +112,7 @@ Describe :ConflictMarkerNextHunk
             Assert Equals(line('.'), 9)
         End
 
-        It with bang accepts at cursor
+        It accepts position at cursor with bang
             normal! ggj
             ConflictMarkerNextHunk!
             Assert Equals(line('.'), 2)
@@ -128,7 +128,7 @@ Describe :ConflictMarkerNextHunk
             close!
         End
 
-        It move cursor to next hunk
+        It moves cursor to next hunk
             normal! gg
             for l in [2, 11, 20]
                 ConflictMarkerNextHunk
@@ -148,7 +148,7 @@ Describe :ConflictMarkerNextHunk
             Assert Equals(line('.'), 11)
         End
 
-        It with bang accepts at cursor
+        It accepts position at cursor with bang
             normal! ggj
             ConflictMarkerNextHunk!
             Assert Equals(line('.'), 2)
@@ -172,7 +172,7 @@ Describe :ConflictMarkerNextHunk
             endfor
         End
 
-        It accepts at cursor with bang
+        It accepts position at cursor with bang
             normal! ggj
             ConflictMarkerNextHunk!
             Assert Equals(line('.'), 2)
@@ -190,7 +190,7 @@ Describe :ConflictMarkerPrevHunk
             close!
         End
 
-        It move cursor to previous hunk
+        It moves cursor to previous hunk
             normal! G
             for l in [16, 9, 2]
                 ConflictMarkerPrevHunk
@@ -210,7 +210,7 @@ Describe :ConflictMarkerPrevHunk
             Assert Equals(line('.'), 9)
         End
 
-        It with bang accepts at cursor
+        It accepts position at cursor with bang
             normal! Gk
             ConflictMarkerPrevHunk!
             Assert Equals(line('.'), 16)
@@ -226,7 +226,7 @@ Describe :ConflictMarkerPrevHunk
             close!
         End
 
-        It move cursor to previous hunk
+        It moves cursor to previous hunk
             normal! G
             for l in [20, 11, 2]
                 ConflictMarkerPrevHunk
@@ -246,7 +246,7 @@ Describe :ConflictMarkerPrevHunk
             Assert Equals(line('.'), 11)
         End
 
-        It with bang accepts at cursor
+        It accepts position at cursor with bang
             normal! Gk
             ConflictMarkerPrevHunk!
             Assert Equals(line('.'), 20)
@@ -262,15 +262,15 @@ Describe :ConflictMarkerPrevHunk
             close!
         End
 
-        It move cursor to previous hunk
+        It moves cursor to previous hunk
             normal! G
             for l in [9, 2]
                 ConflictMarkerPrevHunk
                 Assert Equals(line('.'), l)
             endfor
         End
 
-        It accepts at cursor with bang
+        It accepts position at cursor with bang
             normal! Gk
             ConflictMarkerPrevHunk!
             Assert Equals(line('.'), 9)

test/test_matchit.vimspec

@@ -38,7 +38,7 @@ Describe matchit
         Assert Equals(b:match_words, '^<<<<<<<\+:^|||||||\+:^=======\+$:^>>>>>>>\+')
     End
 
-    It can jump within a conflict marker
+    It jumps jumps between delimiters in a conflict marker
         normal! gg
         normal %
         Assert Equals(line('.'), 3)
@@ -64,7 +64,7 @@ Describe matchit with diff3
         close!
     End
 
-    It can jump within a conflict marker
+    It jumps between delimiters in a conflict marker
         normal! gg
         normal %
         Assert Equals(line('.'), 3)

test/test_resolve.vimspec

@@ -194,7 +194,7 @@ Describe :ConflictMarkerBoth
         End
 
         Context with bang
-            It resolves a conflict by keeping theirs and ours in reverse order
+            It resolves a conflict by keeping theirs and ours in reverse order with bang
                 ConflictMarkerBoth!
                 Assert Equals(getline(1, '$'), ['themselves', 'ourselves', ''])
             End

test/test_syntax.vimspec

@@ -67,7 +67,7 @@ Describe Conflict marker
             let g:conflict_marker_enable_detect = saved
         End
 
-        It can disable detection (#18)
+        It disables detection when 0 is set (#18)
             let g:conflict_marker_enable_detect = 0
             doautocmd BufReadPost
             for l in [1, 8, 15]