diff options
Diffstat (limited to 'main.go')
| -rw-r--r-- | main.go | 11 |
1 files changed, 11 insertions, 0 deletions
@@ -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 { |
