# HG changeset patch
# User Kristian H?gsberg <krh@redhat.com>
# Date 1215568556 14400
# Node ID 643c4a94c2ae210f0ebc81653132ce46cd8c1791
# Parent  068a7429db5d7e05e5b36d6abbdf66841914eb94
Use the file string pool when merging directories.

diff -r 068a7429db5d -r 643c4a94c2ae librazor/merger.c
--- a/librazor/merger.c	Wed Jul 02 14:39:44 2008 -0400
+++ b/librazor/merger.c	Tue Jul 08 21:55:56 2008 -0400
@@ -261,8 +261,8 @@
 	set2 = merger->source2.set;
 	map1 = merger->source1.file_map;
 	map2 = merger->source2.file_map;
-	pool1 = set1->string_pool.data;
-	pool2 = set2->string_pool.data;
+	pool1 = set1->file_string_pool.data;
+	pool2 = set2->file_string_pool.data;
 	root1 = (struct razor_entry *) set1->files.data;
 	root2 = (struct razor_entry *) set2->files.data;