mergetool: use get_merge_tool function

diff --git a/git-compat-util.h b/git-compat-util.h
index 3ba93d9c155e6ec2eecbe78e8dc5ea98b2a4f6eb..48c955541e2000239f861bdf7dd5043fa741674c 100644 (file)
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -147,7 +147,7 @@
 
 #if defined(WIN32) && !defined(__CYGWIN__) /* Both MinGW and MSVC */
 # if !defined(_WIN32_WINNT)
-#  define _WIN32_WINNT 0x0502
+#  define _WIN32_WINNT 0x0600
 # endif
 #define WIN32_LEAN_AND_MEAN  /* stops windows.h including winsock.h */
 #include <winsock2.h>