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

2010-05-03 13:34:23 -07:00 · 2010-05-03 13:34:23 -07:00 · 47dc5e28f2
parent bb94632d56
commit 47dc5e28f2
1 changed files with 1 additions and 1 deletions
--- a/2
+++ b/2
@ -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) &&