summaryrefslogtreecommitdiff
path: root/main.go
diff options
context:
space:
mode:
Diffstat (limited to 'main.go')
-rw-r--r--main.go4
1 files changed, 3 insertions, 1 deletions
diff --git a/main.go b/main.go
index 4da231a..893c20d 100644
--- a/main.go
+++ b/main.go
@@ -53,7 +53,9 @@ func main() {
}
if argv.Merge != nil {
- doMerge()
+ if err := doMerge(); err != nil {
+ badExit(err)
+ }
okExit("")
}