diff options
| author | Stefan Beller <stefanbeller@gmail.com> | 2014-09-23 16:55:50 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-09-23 11:31:41 -0700 |
| commit | 040b2ac978366215bfc27be5e110a2f0170e6864 (patch) | |
| tree | 0a8a01c5fc10d7a170f01ece081c1536316b30a6 /merge-recursive.c | |
| parent | 422af49c2fe707c5e7bff1e4a8250232401154b0 (diff) | |
| download | git-040b2ac978366215bfc27be5e110a2f0170e6864.tar.gz | |
merge-recursive: remove stale commented debugging codesb/merge-recursive-copy-paste-fix
Signed-off-by: Stefan Beller <stefanbeller@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.c')
| -rw-r--r-- | merge-recursive.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index ceb50353f7..7220199408 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -1107,10 +1107,6 @@ error_return: 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; |