From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 3 May 2010 20:34:23 +0000 (-0700)
Subject: Reintegrate: do not fail when garbage is found in the orignal
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=47dc5e28f2c3aeceeab6155162dea4daeb149f5d;p=thirdparty%2Fgit.git

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

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) &&