Merge branch 'jc/fix-diff-files-unmerged' into maint

diff --git a/git-compat-util.h b/git-compat-util.h
index 49b50eec86828066c90b6165c35ec21cb51e85ce..40498b33c9f09ef9cac1f7340a9a1ceb2ffcd50d 100644 (file)
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -118,6 +118,7 @@
 #endif
 #ifndef __MINGW32__
 #include <sys/wait.h>
+#include <sys/resource.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <termios.h>