user-manual: reset to ORIG_HEAD not HEAD to undo merge

diff --git a/Makefile b/Makefile
index e18b007da26e95b2c34297d2f8c55fb055c0f5dc..f674e556ffa9b14f2e9cfd3a82e7e49d028979ed 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -378,7 +378,6 @@ ifeq ($(uname_O),Cygwin)
        NO_STRCASESTR = YesPlease
        NO_SYMLINK_HEAD = YesPlease
        NEEDS_LIBICONV = YesPlease
-       NO_C99_FORMAT = YesPlease
        NO_FAST_WORKING_DIRECTORY = UnfortunatelyYes
        NO_TRUSTABLE_FILEMODE = UnfortunatelyYes
        # There are conflicting reports about this.