From 1593c94d9034a0645e07f6e6b7037ba6c6086f8c Mon Sep 17 00:00:00 2001
From: ScottNZ <stealtharcher.scott@gmail.com>
Date: Fri, 14 Jun 2013 20:33:26 +1200
Subject: [PATCH] Add some debugging information to LoadYamlRules

---
 OpenRA.Game/GameRules/Rules.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/OpenRA.Game/GameRules/Rules.cs b/OpenRA.Game/GameRules/Rules.cs
index 1215311c6e..76ea3d9516 100755
--- a/OpenRA.Game/GameRules/Rules.cs
+++ b/OpenRA.Game/GameRules/Rules.cs
@@ -46,9 +46,9 @@ namespace OpenRA
 
 		static Dictionary<string, T> LoadYamlRules<T>(string[] files, List<MiniYamlNode> dict, Func<MiniYamlNode, Dictionary<string, MiniYaml>, T> f)
 		{
-			var y = files.Select(a => MiniYaml.FromFile(a)).Aggregate(dict, MiniYaml.MergeLiberal);
-			var yy = y.ToDictionary( x => x.Key, x => x.Value );
-			return y.ToDictionary(kv => kv.Key.ToLowerInvariant(), kv => f(kv, yy));
+			var y = files.Select(MiniYaml.FromFile).Aggregate(dict, MiniYaml.MergeLiberal);
+			var yy = y.ToDictionary(x => x.Key, x => x.Value);
+			return y.ToDictionaryWithConflictLog(kv => kv.Key.ToLowerInvariant(), kv => f(kv, yy), "LoadYamlRules", null, null);
 		}
 
 		public static IEnumerable<KeyValuePair<string,MusicInfo>> InstalledMusic { get { return Music.Where( m => m.Value.Exists ); } }