Merge branch 'maint'

* maint: Start preparing for 1.7.4.4 pull: do not clobber untracked files on initial pull compat: add missing #include <sys/resource.h> Conflicts: RelNotes
2011-04-03 13:53:11 -07:00
parent 485cdb9bd8 8e848868ff
commit 44bc573436
2 changed files with 38 additions and 0 deletions
--- 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>