From d255e6c8c6c8a2282e35b8b43c1bd8e12e7a6906 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Kristian=20H=C3=B8gsberg?= <krh@redhat.com>
Date: Tue, 8 Jul 2008 21:56:48 -0400
Subject: [PATCH] Fix old typo in file merging code.

---
 librazor/merger.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/librazor/merger.c b/librazor/merger.c
index 1d1615e..3ca69fa 100644
--- a/librazor/merger.c
+++ b/librazor/merger.c
@@ -284,7 +284,7 @@ merge_one_directory(struct razor_merger *merger, struct merge_directory *md)
 			continue;
 		}
 		if (e1 && !map1[e1 - root1] &&
-		    e2 && !map1[e2 - root2]) {
+		    e2 && !map2[e2 - root2]) {
 			if ((e1++)->flags & RAZOR_ENTRY_LAST)
 				e1 = NULL;
 			if ((e2++)->flags & RAZOR_ENTRY_LAST)
-- 
1.7.1