Improve error messages for configurable merge tool arguments

twpayne · Aug 5, 2021 · 0eb5348 · 0eb5348
1 parent 7b3e307
commit 0eb5348
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/internal/cmd/mergecmd.go b/internal/cmd/mergecmd.go
@@ -3,6 +3,7 @@ package cmd
 import (
 	"fmt"
 	"os"
+	"strconv"
 	"strings"
 	"text/template"
 
@@ -85,8 +86,8 @@ func (c *Config) runMergeCmd(cmd *cobra.Command, args []string, sourceState *che
 			Target:      string(targetStatePath),
 		}
 		args := make([]string, 0, len(c.Merge.Args))
-		for _, arg := range c.Merge.Args {
-			tmpl, err := template.New("").Parse(arg)
+		for i, arg := range c.Merge.Args {
+			tmpl, err := template.New("merge.args[" + strconv.Itoa(i) + "]").Parse(arg)
 			if err != nil {
 				return err
 			}