Reintegrate: do not fail when garbage is found in the orignal

diff --git a/Reintegrate b/Reintegrate
index 515f475670d7ed294ac4251bc1e86de970ad8756..151bd59f8f3b0887616124972e4517ebdab8cdc6 100755 (executable)
--- 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) &&