merge-recursive: remove stale commented debugging code
Signed-off-by: Stefan Beller <stefanbeller@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Stefan Beller committed
Sep 23, 2014 at 16:55 UTC
040b2ac978366215bfc27be5e110a2f0170e6864
1 file changed
-4
merge-recursive.c
-4
@@ -1107,10 +1107,6 @@ error_return:
1107
static int process_entry(struct merge_options *o,
1108
const char *path, struct stage_data *entry)
1109
{
1110
- /*
1111
- printf("processing entry, clean cache: %s\n", index_only ? "yes": "no");
1112
- print_index_entry("\tpath: ", entry);
1113
- */
1110
int clean_merge = 1;
1111
unsigned o_mode = entry->stages[1].mode;
1112
unsigned a_mode = entry->stages[2].mode;