From 9fe667f14644825cb97be9f4b8fab8f287326a12 Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Tue, 11 Mar 2008 17:15:02 -0400 Subject: [PATCH] Fix file tree merging (broken since 7b26d6b3) --- razor.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/razor.c b/razor.c index 0e28604..2636695 100644 --- a/razor.c +++ b/razor.c @@ -1608,7 +1608,9 @@ merge_files(struct razor_merger *merger) map1 = merger->source1.file_map; map2 = merger->source2.file_map; - md.merged = add_file(merger, ""); + md.merged = 0; + root = (struct razor_entry *) merger->set->files.data; + root->name = hashtable_tokenize(&merger->table, ""); if (merger->source1.set->files.size) { root = (struct razor_entry *) merger->source1.set->files.data; -- 1.7.1