From: Stefan Beller <stefanbeller@gmail.com>
Date: Tue, 23 Sep 2014 14:55:50 +0000 (+0200)
Subject: merge-recursive: remove stale commented debugging code
X-Git-Tag: v2.2.0-rc0~69^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=040b2ac978366215bfc27be5e110a2f0170e6864;p=git

merge-recursive: remove stale commented debugging code

Signed-off-by: Stefan Beller <stefanbeller@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/merge-recursive.c b/merge-recursive.c
index ceb50353f7..7220199408 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -1107,10 +1107,6 @@ error_return:
 static int process_entry(struct merge_options *o,
 			 const char *path, struct stage_data *entry)
 {
-	/*
-	printf("processing entry, clean cache: %s\n", index_only ? "yes": "no");
-	print_index_entry("\tpath: ", entry);
-	*/
 	int clean_merge = 1;
 	unsigned o_mode = entry->stages[1].mode;
 	unsigned a_mode = entry->stages[2].mode;