From 93c55170af6a7763b018b19f96964a50834add5b Mon Sep 17 00:00:00 2001
From: Hylke Bons <hylkebons@gmail.com>
Date: Fri, 6 May 2011 11:31:30 +0100
Subject: [PATCH] repo: add debug info about conflict type when resolving

---
 SparkleLib/SparkleRepo.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/SparkleLib/SparkleRepo.cs b/SparkleLib/SparkleRepo.cs
index e0c5d00d..92486427 100644
--- a/SparkleLib/SparkleRepo.cs
+++ b/SparkleLib/SparkleRepo.cs
@@ -640,6 +640,8 @@ namespace SparkleLib {
                 string conflicting_path = line.Substring (3);
                 conflicting_path = conflicting_path.Trim ("\"".ToCharArray ());
 
+                SparkleHelpers.DebugInfo ("Git", "[" + Name + "] Conflict type: " + line);
+
                 // Both the local and server version have been modified
                 if (line.StartsWith ("UU") || line.StartsWith ("AA") ||
                     line.StartsWith ("AU") || line.StartsWith ("UA")) {