From 1afdd6bcc0cd633333287af26a71adb3a737d4d6 Mon Sep 17 00:00:00 2001
From: rene <41963722+renaynay@users.noreply.github.com>
Date: Tue, 20 Oct 2020 10:56:51 +0200
Subject: [PATCH] console: don't exit on ctrl-c, only on ctrl-d (#21660)

* add interrupt counter

* remove interrupt counter, allow ctrl-C to clear ONLY, ctrl-D will terminate console, stop node

* format

* add instructions to exit

* fix tests
# Conflicts:
#	cmd/geth/consolecmd_test.go
#	console/console.go
---
 to-merge.txt | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/to-merge.txt b/to-merge.txt
index 9c1db041b..d1b7a4a58 100644
--- a/to-merge.txt
+++ b/to-merge.txt
@@ -567,9 +567,3 @@ Date:   Fri Oct 16 11:28:03 2020 +0200
     * core/vm: marshall returnData as hexstring in trace logs
     
     * core/vm: marshall returnData as hexstring in trace logs
-
-commit 51d026ca8554a04fccd5c5008aadffbd5c0594c7
-Author: Felix Lange <fjl@twurst.com>
-Date:   Thu Oct 15 12:30:41 2020 +0200
-
-    params: begin v1.9.24 release cycle