modify/delete conflict resolution overwrites untracked file

diff --git a/run-command.h b/run-command.h
index debe3074b5a01fb5a19e61f07ff66c250cdc4f82..5203a9ebb10b14bd06862abafed0ab73d7514a3d 100644 (file)
--- a/run-command.h
+++ b/run-command.h
@@ -76,7 +76,12 @@ struct async {
        int (*proc)(int fd, void *data);
        void *data;
        int out;        /* caller reads from here and closes it */
+#ifndef __MINGW32__
        pid_t pid;
+#else
+       HANDLE tid;
+       int fd_for_proc;
+#endif
 };
 
 int start_async(struct async *async);