summaryrefslogtreecommitdiff
path: root/main.go
diff options
context:
space:
mode:
Diffstat (limited to 'main.go')
-rw-r--r--main.go11
1 files changed, 11 insertions, 0 deletions
diff --git a/main.go b/main.go
index 6f0ea5f..daa545d 100644
--- a/main.go
+++ b/main.go
@@ -7,6 +7,7 @@ package main
import (
"embed"
+ "fmt"
"os"
"strings"
@@ -138,6 +139,16 @@ func main() {
okExit("")
}
+ if argv.Merge != nil {
+ if argv.Merge.Devel != nil {
+ if _, err := doMergeDevel(); err != nil {
+ badExit(err)
+ }
+ okExit("devel merge ok")
+ }
+ badExit(fmt.Errorf("merge what?"))
+ }
+
if argv.Pull != nil {
if argv.Pull.Sync != nil {
if err := doSync(); err != nil {