[PATCH] Merging the Cygwin changes

diff --git a/Makefile b/Makefile
index 4ea6d9a71b55f74b4f0ffe261dc1cc6f0a28fc9b..133808c82fe37a5dc086b7cdaf436bc3ce0027a6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -297,13 +297,9 @@ all:
 git: git.sh Makefile
        rm -f $@+ $@
        sed -e '1s|#!.*/sh|#!$(SHELL_PATH)|' \
-<<<<<<< Makefile
-           -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
-           -e 's/@@X@@/$(X)/g' <$@.sh >$@+
-=======
            -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
+           -e 's/@@X@@/$(X)/g' \
            $(GIT_LIST_TWEAK) <$@.sh >$@+
->>>>>>> .merge_file_3QHyD4
        chmod +x $@+
        mv $@+ $@