Commits

bitsquid committed e81b7d3

Removed file delete - bad choice... must be some other way of marking conflicts resolved in subversion.

Comments (0)

Files changed (1)

json_merge/Program.cs

                         Hashtable result = JsonDiff.Merge(parent, theirs, mine);
                         Save(result, args[i + 4]);
                     }
-
-                    // Remove source files (should their be an option for this?)
-                    File.Delete(args[i + 1]);
-                    File.Delete(args[i + 2]);
-                    File.Delete(args[i + 3]);
                     i += 5;
                 }
                 else if (args[i] == "-help")