merge & sequencer: turn "Conflicts:" hint into a comment

diff --git a/help.c b/help.c
index 08c54ef1c1669edce960c52948b80340c36eb119..f068925bb7f26055fb699cda7173a0c06ac46a22 100644 (file)
--- a/help.c
+++ b/help.c
@@ -107,10 +107,7 @@ static int is_executable(const char *name)
            !S_ISREG(st.st_mode))
                return 0;
 
-#if defined(GIT_WINDOWS_NATIVE) || defined(__CYGWIN__)
-#if defined(__CYGWIN__)
-if ((st.st_mode & S_IXUSR) == 0)
-#endif
+#if defined(GIT_WINDOWS_NATIVE)
 {      /* cannot trust the executable bit, peek into the file instead */
        char buf[3] = { 0 };
        int n;