lots more code cleanups

1 files changed, 28 insertions, 26 deletions

diff --git a/windowReposFix.go b/windowReposFix.go
index 64ea40f..4b5d534 100644
--- a/windowReposFix.go
+++ b/windowReposFix.go
@@ -218,40 +218,42 @@ func makeHackModeWindow(stdwin *stdReposTableWin) {
 	group2 := stdwin.win.Top.NewGroup("Merge")
 	grid = group2.RawGrid()
 
-	grid.NewButton("merge to devel", func() {
-		stdwin.win.Disable()
-		defer stdwin.win.Enable()
+	/*
+		grid.NewButton("merge to devel", func() {
+			stdwin.win.Disable()
+			defer stdwin.win.Enable()
 
-		mergeUserToDevel(true)
-	})
+			mergeUserToDevel(true)
+		})
 
-	grid.NewButton("merge to master", func() {
-		stdwin.win.Disable()
-		defer stdwin.win.Enable()
+		grid.NewButton("merge to master", func() {
+			stdwin.win.Disable()
+			defer stdwin.win.Enable()
 
-		mergeDevelToMaster(true)
-	})
+			mergeDevelToMaster(true)
+		})
 
-	grid.NewButton("merge all", func() {
-		stdwin.win.Disable()
-		defer stdwin.win.Enable()
+		grid.NewButton("merge all", func() {
+			stdwin.win.Disable()
+			defer stdwin.win.Enable()
 
-		if err := doAllCheckoutDevel(); err != nil {
-			log.Info("checkout error:", err)
-		} else {
-			log.Info("checkout was ok")
-		}
+			if err := doAllCheckoutDevel(); err != nil {
+				log.Info("checkout error:", err)
+			} else {
+				log.Info("checkout was ok")
+			}
 
-		mergeUserToDevel(true)
+			mergeUserToDevel(true)
 
-		if err := doAllCheckoutMaster(); err != nil {
-			log.Info("checkout error:", err)
-		} else {
-			log.Info("checkout was ok")
-		}
+			if err := doAllCheckoutMaster(); err != nil {
+				log.Info("checkout error:", err)
+			} else {
+				log.Info("checkout was ok")
+			}
 
-		mergeDevelToMaster(true)
-	})
+			mergeDevelToMaster(true)
+		})
+	*/
 
 	grid.NewButton("show dirty repos on win.Bottom", func() {
 		log.Info("try to show dirty repos on bottom")