ci-merge: Remove the terminal() function

We no longer spawn a new terminal for 'git mergetool'. Remove the function
that tried to find a suitable terminal

Signed-off-by: Amit Kucheria <amit.kucheria@linaro.org>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>

1 files changed, 1 insertions, 15 deletions

diff --git a/ci-merge b/ci-merge
index b4327bc..950e34a 100755
--- a/ci-merge
+++ b/ci-merge
@@ -49,9 +49,7 @@
 # 3. Conflict resolution
 #
 # As soon as there is a conflict detected, the merge tool is invoked,
-# the default is vimdiff. *Note* that will open a terminal, so if X11
-# forwarding is not set with the ssh connection (if any) the
-# integration process will fail.
+# the default is vimdiff.
 #
 # Take care of correctly fix the conflicts, otherwise the bad
 # resolutions will be saved and reused later by the rerere mechanism,
@@ -297,18 +295,6 @@ git_rerere_update() {
 
 ######################################################################
 #
-# Use appropriate terminal
-#
-terminal() {
-    if [ -x /usr/bin/x-terminal-emulator ]; then
-	x-terminal-emulator $@
-    else
-	xterm $@
-    fi
-}
-
-######################################################################
-#
 # Check we have a configuration file before continuing
 #
 config_setup() {