From f9656f73ff728f6b7a4b615f32aff23b96f573ac Mon Sep 17 00:00:00 2001
From: Matt Nadareski <mnadareski@outlook.com>
Date: Wed, 11 May 2016 09:51:20 -0700
Subject: [PATCH] Ignore the _dedup value in checking because it doesn't matter

---
 DATabase/MergeDiff.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/DATabase/MergeDiff.cs b/DATabase/MergeDiff.cs
index ecce50be..3111f75a 100644
--- a/DATabase/MergeDiff.cs
+++ b/DATabase/MergeDiff.cs
@@ -119,7 +119,7 @@ namespace SabreTools
 
 					foreach (RomData rom in temp)
 					{
-						if ((_dedup && rom.Dupe != DupeType.ExternalHash) || (!_dedup && rom.Dupe != DupeType.ExternalAll))
+						if (rom.Dupe != DupeType.ExternalHash && rom.Dupe != DupeType.ExternalAll)
 						{
 							if (diffed.ContainsKey(key))
 							{
@@ -178,7 +178,7 @@ namespace SabreTools
 
 					foreach (RomData rom in temp)
 					{
-						if ((_dedup && rom.Dupe == DupeType.ExternalHash) || (!_dedup && rom.Dupe == DupeType.ExternalAll))
+						if (rom.Dupe == DupeType.ExternalHash || rom.Dupe == DupeType.ExternalAll)
 						{
 							if (duplicates.ContainsKey(key))
 							{