From 2226deab68d7cfeca6911c0ad413ca7e16f17493 Mon Sep 17 00:00:00 2001
From: slarse <slarse@kth.se>
Date: Tue, 12 May 2020 19:32:04 +0200
Subject: [PATCH] [misc] Fix broken test

---
 src/test/java/se/kth/spork/cli/CliTest.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/test/java/se/kth/spork/cli/CliTest.java b/src/test/java/se/kth/spork/cli/CliTest.java
index a1e3daea..a6453e8d 100644
--- a/src/test/java/se/kth/spork/cli/CliTest.java
+++ b/src/test/java/se/kth/spork/cli/CliTest.java
@@ -23,11 +23,11 @@ class CliTest {
     @ParameterizedTest
     @ArgumentsSource(Util.ConflictSourceProvider.class)
     void merge_shouldExitNonZero_onConflict(Util.TestSources sources) {
-        String[] args = {"merge", sources.left.toString(), sources.base.toString(), sources.right.toString()};
+        String[] args = {sources.left.toString(), sources.base.toString(), sources.right.toString()};
 
         int exitCode = new CommandLine(new Cli.Merge()).execute(args);
 
-        assertNotEquals(0, exitCode);
+        assertTrue(exitCode > 0);
     }
 
     @ParameterizedTest