Skip to content

Commit 040b2ac

Browse files
stefanbellergitster
authored andcommitted
merge-recursive: remove stale commented debugging code
Signed-off-by: Stefan Beller <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 422af49 commit 040b2ac

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

merge-recursive.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1107,10 +1107,6 @@ static int blob_unchanged(const unsigned char *o_sha,
11071107
static int process_entry(struct merge_options *o,
11081108
const char *path, struct stage_data *entry)
11091109
{
1110-
/*
1111-
printf("processing entry, clean cache: %s\n", index_only ? "yes": "no");
1112-
print_index_entry("\tpath: ", entry);
1113-
*/
11141110
int clean_merge = 1;
11151111
unsigned o_mode = entry->stages[1].mode;
11161112
unsigned a_mode = entry->stages[2].mode;

0 commit comments

Comments
 (0)