add 'forge merge master'v0.22.123

1 files changed, 7 insertions, 0 deletions

diff --git a/main.go b/main.go
index daa545d..22ec51a 100644
--- a/main.go
+++ b/main.go
@@ -146,6 +146,13 @@ func main() {
 			}
 			okExit("devel merge ok")
 		}
+
+		if argv.Merge.Master != nil {
+			if _, err := doMergeMaster(); err != nil {
+				badExit(err)
+			}
+			okExit("master merge ok")
+		}
 		badExit(fmt.Errorf("merge what?"))
 	}