From: Junio C Hamano <junkio@cox.net>
Date: Mon, 3 Oct 2005 23:05:50 +0000 (-0700)
Subject: [PATCH] Merging the Cygwin changes
X-Git-Tag: v0.99.9~203
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=c8c5b21a3714db3272f869c82f3ce862ed9c2cc6;p=git.git

[PATCH] Merging the Cygwin changes

Fix mismerge typo.

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/Makefile b/Makefile
index 4ea6d9a7..133808c8 100644
--- 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 $@+ $@