From 40c7f8a61c569cef9caf258c8c1d2663627384d3 Mon Sep 17 00:00:00 2001
From: Johannes Sixt <johannes.sixt@telecom.at>
Date: Wed, 26 Dec 2007 20:35:45 +0100
Subject: [PATCH] Revert "Strip \r from the input."

This reverts commit 5bc08ee66f49beedb5327446ff147e92345df65c, which
is no longer needed since git-ls-remote is built-in.
---
 builtin-fmt-merge-msg.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/builtin-fmt-merge-msg.c b/builtin-fmt-merge-msg.c
index c7de27c849..6163bd4975 100644
--- a/builtin-fmt-merge-msg.c
+++ b/builtin-fmt-merge-msg.c
@@ -95,8 +95,6 @@ static int handle_line(char *line)
 		return 3;
 
 	if (line[len - 1] == '\n')
-		line[len - 1] = 0, --len;
-	if (line[len - 1] == '\r')
 		line[len - 1] = 0;
 	line += 42;
 
-- 
2.11.4.GIT