mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge-recursive: remove stale commented debugging code

Browse Source 
Signed-off-by: Stefan Beller <stefanbeller@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Stefan Beller
2014-09-23 16:55:50 +02:00
committed by Junio C Hamano
parent 422af49c2f
commit 040b2ac978
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
merge-recursive.c
View File

@ -1107,10 +1107,6 @@ error_return:
static int process_entry(struct merge_options *o, static int process_entry(struct merge_options *o,
const char *path, struct stage_data *entry) 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; int clean_merge = 1;
unsigned o_mode = entry->stages[1].mode; unsigned o_mode = entry->stages[1].mode;
unsigned a_mode = entry->stages[2].mode; unsigned a_mode = entry->stages[2].mode;