cherry-pick/revert: add scissors line on merge conflict

diff --git a/builtin/merge.c b/builtin/merge.c
index 03b9f7230a1ade2e11a3a44bd7635fabe4ce2fd1..e96f72af8044769df6b4ef42f0525b572b0c39e2 100644 (file)
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -927,14 +927,8 @@ static int suggest_conflicts(void)
         * Thus, we will get the cleanup mode which is returned when we _are_
         * using an editor.
         */
-       if (get_cleanup_mode(cleanup_arg, 1) == COMMIT_MSG_CLEANUP_SCISSORS) {
-           fputc('\n', fp);
-           wt_status_add_cut_line(fp);
-           /* comments out the newline from append_conflicts_hint */
-           fputc(comment_line_char, fp);
-       }
-
-       append_conflicts_hint(&the_index, &msgbuf);
+       append_conflicts_hint(&the_index, &msgbuf,
+                             get_cleanup_mode(cleanup_arg, 1));
        fputs(msgbuf.buf, fp);
        strbuf_release(&msgbuf);
        fclose(fp);