From: Stefan Beller Date: Tue, 23 Sep 2014 14:55:50 GMT Subject: [PATCH] merge-recursive: Remove miss leading comment Message-ID: <1411484150-18025-1-git-send-email-stefanbeller@gmail.com> In-Reply-To: <1411332586-18275-1-git-send-email-stefanbeller@gmail.com> Commented code, which doesn't even compile, is of no use any more? Signed-off-by: Stefan Beller --- To be applied on top of sb/merge-recursive-copy-paste-fix merge-recursive.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/merge-recursive.c b/merge-recursive.c index d63524c..8ad4be8 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -1686,10 +1686,6 @@ static int merge_content(struct merge_options *o, 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; int normalize = o->renormalize; unsigned o_mode = entry->stages[1].mode; -- 2.1.0.238.gce1d3a9