diff options
| author | Jeff Carr <[email protected]> | 2025-07-07 20:39:34 -0500 |
|---|---|---|
| committer | Jeff Carr <[email protected]> | 2025-07-07 20:39:34 -0500 |
| commit | 86e513d845acc63b7d3371aaa41ce7d19603f473 (patch) | |
| tree | c8365a5af09f4f1d34447ab334429671a7356d80 /main.go | |
| parent | 5d57a8968d7b2cdd2e6ab9ee8ef0af9c9fc2fc23 (diff) | |
minor
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 { |
