[PATCH] Merging the Cygwin changes

Fix mismerge typo. Signed-off-by: Junio C Hamano <junkio@cox.net>
git-mirror · Oct 3, 2005 · c8c5b21 · c8c5b21
1 parent 79a9d8e
commit c8c5b21
Showing 1 changed file with 1 addition and 5 deletions.
diff --git 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 $@+ $@