diff --git a/Reintegrate b/Reintegrate index 515f475670..151bd59f8f 100755 --- a/Reintegrate +++ b/Reintegrate @@ -91,7 +91,7 @@ show_merge () { ;; *) echo 2>&1 "Huh?: $msg" - exit 1 + return ;; esac && tip=$(git rev-parse --verify "refs/$merge_hier$branch" 2>/dev/null) &&