Commit 040b2ac9 authored by Stefan Beller's avatar Stefan Beller Committed by Junio C Hamano

merge-recursive: remove stale commented debugging code

Signed-off-by: default avatarStefan Beller <[email protected]>
Signed-off-by: default avatarJunio C Hamano <[email protected]>
parent 422af49c
......@@ -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;
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment