fixed problem with main_test.go, issue with rebasing

cmd/main_test.go

@@ -5,10 +5,7 @@ import (
 	"io"
 	"os"
 	"os/exec"
-<<<<<<< HEAD
 	"runtime"
-=======
->>>>>>> 7561678 (windows and case-friendly executable alias)
 	"strings"
 
 	"testing"
@@ -108,14 +105,10 @@ func TestHandleCLIVersionFlag(t *testing.T) {
 func TestHandleCLIExecutableAlias(t *testing.T) {
 	// If we're in the process started by exec.Command, run the handleCLI function.
 	if os.Getenv("BE_CRASHER") == "1" {
-<<<<<<< HEAD
 		err := handleCLI(os.Args[1:])
 		if err != nil {
 			t.Fatalf("Function returns error")
 		}
-=======
-		handleCLI(os.Args[1:])
->>>>>>> 7561678 (windows and case-friendly executable alias)
 		return
 	}
 
@@ -193,11 +186,6 @@ func TestHandleCLIExecutableAlias(t *testing.T) {
 			if !ok {
 				t.Fatal("Failed to cast error as *exec.ExitError")
 			}
-<<<<<<< HEAD
-=======
-			// Here you might want to check the exit code if it's relevant to your test.
-			// exitCode := exitError.ExitCode()
->>>>>>> 7561678 (windows and case-friendly executable alias)
 		}
 		// Apparently both stashcp and *_plug will trigger Exit(1) with error if
 		// the arguments are not enough/solid
@@ -209,7 +197,6 @@ func TestHandleCLIExecutableAlias(t *testing.T) {
 		}
 	}
 	for _, tc := range testCases {
-<<<<<<< HEAD
 		if os := runtime.GOOS; os == "windows" {
 			// On Windows, you can only do *.exe
 			t.Run(tc.name+"-windows", func(t *testing.T) {
@@ -235,22 +222,5 @@ func TestHandleCLIExecutableAlias(t *testing.T) {
 				tc.args[0] = preserve
 			})
 		}
-=======
-		t.Run(tc.name, func(t *testing.T) {
-			batchTest(t, tc.args, tc.expected)
-		})
-		t.Run(tc.name+"-windows", func(t *testing.T) {
-			preserve := tc.args[0]
-			tc.args[0] = preserve + ".exe"
-			batchTest(t, tc.args, tc.expected)
-			tc.args[0] = preserve
-		})
-		t.Run(tc.name+"-mixedCase", func(t *testing.T) {
-			preserve := tc.args[0]
-			tc.args[0] = strings.ToUpper(preserve)
-			batchTest(t, tc.args, tc.expected)
-			tc.args[0] = preserve
-		})
->>>>>>> 7561678 (windows and case-friendly executable alias)
 	}
-}
+}