summaryrefslogtreecommitdiff
path: root/main.go
diff options
context:
space:
mode:
authorJeff Carr <[email protected]>2025-08-28 14:05:01 -0500
committerJeff Carr <[email protected]>2025-08-28 19:30:59 -0500
commitc193af11e7f2d32b336127e123e496c5c16915e3 (patch)
tree85242b84379882a3e8b0aa03250a8c88046b1517 /main.go
parent6b6b31eef6f6a636db0750fcd0d59e3e0758013e (diff)
try merging patches together
Diffstat (limited to 'main.go')
-rw-r--r--main.go5
1 files changed, 5 insertions, 0 deletions
diff --git a/main.go b/main.go
index c82397a..4da231a 100644
--- a/main.go
+++ b/main.go
@@ -52,6 +52,11 @@ func main() {
okExit("")
}
+ if argv.Merge != nil {
+ doMerge()
+ okExit("")
+ }
+
if argv.Pull != nil {
log.Info("pull here")
okExit("")