summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Carr <[email protected]>2025-09-04 10:40:26 -0500
committerJeff Carr <[email protected]>2025-09-04 10:40:26 -0500
commit5b3764c1b7fff781d9ec84f96ef5ce09aa887f85 (patch)
tree7f0e3c57518213f6784735dd4cb2873ec451fbd0
parent0517f01aa95a251b4bffb49aafa948c77d82e63c (diff)
cleaned up merge output to stdoutv0.22.139
-rw-r--r--main.go8
1 files 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)"))
}