From 5b3764c1b7fff781d9ec84f96ef5ce09aa887f85 Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Thu, 4 Sep 2025 10:40:26 -0500 Subject: [PATCH] cleaned up merge output to stdout --- main.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/main.go b/main.go index d9eb8d9..c51f185 100644 --- a/main.go +++ b/main.go @@ -154,22 +154,22 @@ func main() { start := time.Now() repos, err := doMergeDevel() dur := time.Since(start) - log.Printf("Merged %d devel branches in %s\n", repos.Len(), shell.FormatDuration(dur)) if err != nil { badExit(err) } - okExit("devel merge ok") + log.Printf("Merged %d devel branches in %s\n", repos.Len(), shell.FormatDuration(dur)) + okExit("") } if argv.Merge.Master != nil { start := time.Now() repos, err := doMergeMaster() dur := time.Since(start) - log.Printf("Merged %d master branches in %s\n", repos.Len(), shell.FormatDuration(dur)) if err != nil { badExit(err) } - okExit("master merge ok") + log.Printf("Merged %d master branches in %s\n", repos.Len(), shell.FormatDuration(dur)) + okExit("") } badExit(fmt.Errorf("You must choose which branch to merge to (devel or master)")) }