minor fix

1 files changed, 5 insertions, 7 deletions

diff --git a/doMerge.go b/doMerge.go
index a4ef512..518b483 100644
--- a/doMerge.go
+++ b/doMerge.go
@@ -4,8 +4,6 @@
 package main
 
 import (
-	"fmt"
-
 	"go.wit.com/lib/protobuf/gitpb"
 	"go.wit.com/log"
 )
@@ -19,10 +17,10 @@ func doMergeDevel() (*gitpb.Repos, error) {
 			log.Info("repo is dirty", repo.GetGoPath())
 			continue
 		}
-		log.Infof("%s starting git merge", repo.FullPath)
+		log.Infof("%s starting git merge\n", repo.FullPath)
 		if repo.CheckoutDevel() {
 			log.Info("checkout devel failed", repo.GetGoPath())
-			err = fmt.Errorf("checkout devel failed")
+			err = log.Errorf("checkout devel failed")
 			break
 		}
 		// hash differences when merging user into devel branch
@@ -32,7 +30,7 @@ func doMergeDevel() (*gitpb.Repos, error) {
 		}
 		if _, err := repo.MergeToDevel(); err != nil {
 			log.Info("merge from user failed", repo.GetGoPath(), err)
-			err = fmt.Errorf("merge from user failed")
+			err = log.Errorf("merge from user failed")
 			// log.Info(strings.Join(r.Stdout, "\n"))
 			// log.Info(strings.Join(r.Stderr, "\n"))
 			break
@@ -56,13 +54,13 @@ func doMergeMaster() (*gitpb.Repos, error) {
 		log.Info("Starting merge on", repo.GetGoPath())
 		if repo.CheckoutMaster() {
 			log.Info("checkout devel failed", repo.GetGoPath())
-			err = fmt.Errorf("checkout devel failed")
+			err = log.Errorf("checkout devel failed")
 			break
 		}
 
 		if _, err := repo.MergeToMaster(); err != nil {
 			log.Info("merge from user failed", repo.GetGoPath(), err)
-			err = fmt.Errorf("merge from user failed")
+			err = log.Errorf("merge from user failed")
 			// log.Info(strings.Join(r.Stdout, "\n"))
 			// log.Info(strings.Join(r.Stderr, "\n"))
 			break