merge-recursive: remove stale commented debugging code

Signed-off-by: Stefan Beller <stefanbeller@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-mirror · Sep 23, 2014 · 040b2ac · 040b2ac
1 parent 422af49
commit 040b2ac
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/merge-recursive.c b/merge-recursive.c
@@ -1107,10 +1107,6 @@ static int blob_unchanged(const unsigned char *o_sha,
 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;