commit - a323f6038c66d12f4a3f5b4c136b7bfdbc62f405
commit + 0d57aba161f743f963b069cca68777fcd0f9f21c
blob - 5146237c599a435db382e14925f678bd9fe6cef9
blob + 6e85b11181792ce5861358da8d83c7d53dd5801f
--- vc-got-stage.el
+++ vc-got-stage.el
@@ -80,6 +80,14 @@
                             :filter #'vc-got-stage--filter
                             :sentinel #'vc-got-stage--sentinel))))))
 
+(defun vc-got-stage--kill-separators ()
+  "Kill the separator lines in interactive got stage."
+  (save-excursion
+    (forward-line -2)
+    (kill-line)
+    (goto-char (point-min))
+    (kill-line)))
+
 (defun vc-got-stage--filter (proc string)
   "Filter for got stage process.
 PROC is the process, STRING part of its output."
@@ -97,7 +105,8 @@ PROC is the process, STRING part of its output."
                                          (zero-or-more anychar)
                                          "?")))
               (let ((msg (match-string 1)))
-                (kill-line)
+                (kill-line)             ; kill the question
+                (vc-got-stage--kill-separators)
                 (process-send-string buf (if (y-or-n-p msg) "y\n" "n\n"))
                 (erase-buffer)))))))))