Meta/Reintegrate: die on, instead of silently ignore, an unknown merge

diff --git a/Reintegrate b/Reintegrate
index a1e67a033048d12fb8b10139bc294b11fda29544..aff76f6d96cc4dbd1e0e7eab85ed901c92a36676 100755 (executable)
--- a/Reintegrate
+++ b/Reintegrate
@@ -175,7 +175,6 @@ no)
                        original_branch=
                        into=
                fi
-
        }
 
        leave () {
@@ -327,8 +326,8 @@ show_merge () {
                merge_hier=
                ;;
        *)
-               echo 2>&1 "Huh?: $msg"
-               return
+               echo >&2 "unknown merge: $msg"
+               exit 1
                ;;
        esac &&
        tip=$(git rev-parse --verify "refs/$merge_hier$branch" 2>/dev/null) &&