fixup! Windows: make sure that merge-octopus only outputs LF line endings

It appears this patch is no longer necessary.

Signed-off-by: Johannes Schindelin <[email protected]>

Author: dscho

git-merge-octopus.sh

@@ -71,9 +71,7 @@ do
 
 	case "$LF$common$LF" in
 	*"$LF$SHA1$LF"*)
-		cat << EOF
-Already up-to-date with $pretty_name
-EOF
+		echo "Already up-to-date with $pretty_name"
 		continue
 		;;
 	esac
@@ -85,19 +83,15 @@ EOF
 		# tree as the intermediate result of the merge.
 		# We still need to count this as part of the parent set.
 
-		cat << EOF
-Fast-forwarding to: $pretty_name
-EOF
+		echo "Fast-forwarding to: $pretty_name"
 		git read-tree -u -m $head $SHA1 || exit
 		MRC=$SHA1 MRT=$(git write-tree)
 		continue
 	fi
 
 	NON_FF_MERGE=1
 
-	cat << EOF
-Trying simple merge with $pretty_name
-EOF
+	echo "Trying simple merge with $pretty_name"
 	git read-tree -u -m --aggressive  $common $MRT $SHA1 || exit 2
 	next=$(git write-tree 2>/dev/null)
 	if test $? -ne 0