Add ~* to ignored files
Fix crash when a conflict has been resolved already
This commit is contained in:
parent
0a9aaff4b8
commit
04b3b43f88
|
@ -168,6 +168,7 @@ namespace SparkleLib {
|
|||
// Windows
|
||||
writer.WriteLine ("Thumbs.db");
|
||||
writer.WriteLine ("Desktop.ini");
|
||||
writer.WriteLine ("~*");
|
||||
|
||||
// CVS
|
||||
writer.WriteLine ("*/CVS/*");
|
||||
|
|
|
@ -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) {
|
||||
|
|
Loading…
Reference in a new issue