Work at SourceForge, help us to make it a better place! We have an immediate need for a Support Technician in our San Francisco or Denver office.

Close

Diff of /make_release [9b4890] .. [30825d] Maximize Restore

  Switch to side-by-side view

--- a/make_release
+++ b/make_release
@@ -71,11 +71,11 @@
     hg pull -u "$1"
     if check_heads -q
     then
+        return 1
+    else
         hg merge
         check_heads
         hg commit -m "Automated merge with $1"
-    else
-        return 1
     fi
 }