Avoid "Hit enter to continue" prompt if cmdheight is default

Why: It's annoying and unnecessary. Closes #13. Credit to @jmandawg for the patch.
whiteinge · Nov 30, 2018 · 0cac3a8 · 0cac3a8
1 parent 3cffeb3
commit 0cac3a8
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/plugin/diffconflicts.vim b/plugin/diffconflicts.vim
@@ -94,8 +94,9 @@ endfunction
 
 function! s:checkThenDiff()
     if (s:hasConflicts())
+        redraw
         echohl WarningMsg
-            \ | echo "Resolve conflicts leftward then save. Use :cq to abort."
+            \ | echon "Resolve conflicts leftward then save. Use :cq to abort."
             \ | echohl None
         return s:diffconfl()
     else