diff --git a/SparkleLib/Git/SparkleFetcherGit.cs b/SparkleLib/Git/SparkleFetcherGit.cs
index 390053c1..b8e6a75e 100644
--- a/SparkleLib/Git/SparkleFetcherGit.cs
+++ b/SparkleLib/Git/SparkleFetcherGit.cs
@@ -168,6 +168,7 @@ namespace SparkleLib {
                 // Windows
                 writer.WriteLine ("Thumbs.db");
                 writer.WriteLine ("Desktop.ini");
+                writer.WriteLine ("~*");
 
                 // CVS
                 writer.WriteLine ("*/CVS/*");
diff --git a/SparkleLib/Git/SparkleRepoGit.cs b/SparkleLib/Git/SparkleRepoGit.cs
index 57243311..0b0f631f 100644
--- a/SparkleLib/Git/SparkleRepoGit.cs
+++ b/SparkleLib/Git/SparkleRepoGit.cs
@@ -303,6 +303,11 @@ namespace SparkleLib {
             string output = git_status.StandardOutput.ReadToEnd ().TrimEnd ();
             git_status.WaitForExit ();
 
+            if (String.IsNullOrEmpty (output)) {
+                // no conflict any more.
+                return;
+            }
+
             string [] lines = output.Split ("\n".ToCharArray ());
 
             foreach (string line in lines) {