From a941bd3b809efc445e3f3d0938c0015a513d8b18 Mon Sep 17 00:00:00 2001
From: Hylke Bons <hylkebons@gmail.com>
Date: Mon, 30 May 2011 16:20:25 +0100
Subject: [PATCH] repo git: only disable emable watching once

---
 SparkleLib/Git/SparkleRepoGit.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/SparkleLib/Git/SparkleRepoGit.cs b/SparkleLib/Git/SparkleRepoGit.cs
index 142bb14d..642ff60f 100644
--- a/SparkleLib/Git/SparkleRepoGit.cs
+++ b/SparkleLib/Git/SparkleRepoGit.cs
@@ -230,13 +230,11 @@ namespace SparkleLib {
 
             if (git.ExitCode != 0) {
                 SparkleHelpers.DebugInfo ("Git", "[" + Name + "] Conflict detected. Trying to get out...");
-                DisableWatching ();
 
                 while (AnyDifferences)
                     ResolveConflict ();
 
                 SparkleHelpers.DebugInfo ("Git", "[" + Name + "] Conflict resolved.");
-                EnableWatching ();
 
                 OnConflictResolved ();
             }