pull: check if in unresolved merge state

diff --git a/git-compat-util.h b/git-compat-util.h
index b7a97fbe8300532505b9d63dace2a3f76d8e04e2..17584adbd093a0848debcc23b2a73dcf520a8fb4 100644 (file)
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -189,6 +189,7 @@
 #elif defined(_MSC_VER)
 #include "compat/msvc.h"
 #else
+#include <sys/utsname.h>
 #include <sys/wait.h>
 #include <sys/resource.h>
 #include <sys/socket.h>