This commit is contained in:
Tim Pope
2021-06-19 12:40:07 -04:00
parent be9ff95f27
commit 857c107e5a

View File

@@ -3978,7 +3978,7 @@ function! s:StageApply(info, reverse, extra) abort
endif
endwhile
if start == 0
throw 'fugitive: cold not find hunk'
throw 'fugitive: could not find hunk'
elseif getline(start) !~# '^@@ '
throw 'fugitive: cannot apply conflict hunk'
endif