Merge branch 'group-begin-message' of https://github.com/janslow/task into janslow-group-begin-message

taskfile/merge.go

@@ -17,7 +17,7 @@ func Merge(t1, t2 *Taskfile, namespaces ...string) error {
 	if t2.Expansions != 0 && t2.Expansions != 2 {
 		t1.Expansions = t2.Expansions
 	}
-	if t2.Output != "" {
+	if t2.Output.IsSet() {
 		t1.Output = t2.Output
 	}
 

taskfile/taskfile.go

@@ -3,13 +3,15 @@ package taskfile
 import (
 	"fmt"
 	"strconv"
+
+	"github.com/go-task/task/v3/internal/output"
 )
 
 // Taskfile represents a Taskfile.yml
 type Taskfile struct {
 	Version    string
 	Expansions int
-	Output     string
+	Output     output.Style
 	Method     string
 	Includes   *IncludedTaskfiles
 	Vars       *Vars
@@ -25,7 +27,7 @@ func (tf *Taskfile) UnmarshalYAML(unmarshal func(interface{}) error) error {
 	var taskfile struct {
 		Version    string
 		Expansions int
-		Output     string
+		Output     output.Style
 		Method     string
 		Includes   *IncludedTaskfiles
 		Vars       *Vars