fix merge conflict cat issue on windows

pkg/commands/files.go

@@ -16,7 +16,7 @@ import (
 
 // CatFile obtains the content of a file
 func (c *GitCommand) CatFile(fileName string) (string, error) {
-	return c.OSCommand.RunCommandWithOutput("%s %s", c.OSCommand.Platform.CatCmd, c.OSCommand.Quote(fileName))
+	return c.OSCommand.CatFile(fileName)
 }
 
 // StageFile stages a file

pkg/commands/oscommands/os.go

@@ -24,7 +24,7 @@ import (
 // Platform stores the os state
 type Platform struct {
 	OS              string
-	CatCmd          string
+	CatCmd          []string
 	Shell           string
 	ShellArg        string
 	EscapedQuote    string
@@ -100,6 +100,18 @@ func (c *OSCommand) RunCommandWithOutput(formatString string, formatArgs ...inte
 	return output, err
 }
 
+func (c *OSCommand) CatFile(filename string) (string, error) {
+	arr := append(c.Platform.CatCmd, filename)
+	cmdStr := strings.Join(arr, " ")
+	c.Log.WithField("command", cmdStr).Info("Cat")
+	cmd := c.Command(arr[0], arr[1:]...)
+	output, err := sanitisedCommandOutput(cmd.CombinedOutput())
+	if err != nil {
+		c.Log.WithField("command", cmdStr).Error(err)
+	}
+	return output, err
+}
+
 // RunExecutableWithOutput runs an executable file and returns its output
 func (c *OSCommand) RunExecutableWithOutput(cmd *exec.Cmd) (string, error) {
 	c.BeforeExecuteCmd(cmd)

pkg/commands/oscommands/os_default_platform.go

@@ -9,7 +9,7 @@ import (
 func getPlatform() *Platform {
 	return &Platform{
 		OS:              runtime.GOOS,
-		CatCmd:          "cat",
+		CatCmd:          []string{"cat"},
 		Shell:           "bash",
 		ShellArg:        "-c",
 		EscapedQuote:    `"`,

pkg/commands/oscommands/os_windows.go

@@ -3,7 +3,7 @@ package oscommands
 func getPlatform() *Platform {
 	return &Platform{
 		OS:           "windows",
-		CatCmd:       "cmd /c type",
+		CatCmd:       []string{"cmd", "/c", "type"},
 		Shell:        "cmd",
 		ShellArg:     "/c",
 		EscapedQuote: `\"`,