From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 26 May 2010 17:40:59 +0000 (-0700)
Subject: Reintegrate: allow regeneration of test integration on a detached HEAD
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9ef638879b99950bb72e8a7372b7196f121f7695;p=thirdparty%2Fgit.git

Reintegrate: allow regeneration of test integration on a detached HEAD
---

diff --git a/Reintegrate b/Reintegrate
index 151bd59f8f..602002b628 100755
--- a/Reintegrate
+++ b/Reintegrate
@@ -81,11 +81,11 @@ LF='
 
 show_merge () {
 	case "$msg" in
-	"Merge branch '"*"'"*" into "*)
+	"Merge branch '"*"'"*)
 		branch=$(expr "$msg" : "Merge branch '\(.*\)'")
 		merge_hier=heads/
 		;;
-	"Merge remote branch '"*"'"*" into "*)
+	"Merge remote branch '"*"'"*)
 		branch=$(expr "$msg" : "Merge remote branch '\(.*\)'")
 		merge_hier=
 		;;