@matheusbsbs / matheus-bagliano / commits / c8c5b21a37
Fork 0

[PATCH] Merging the Cygwin changes

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

Junio C Hamano committed Oct 3, 2005 at 16:05 UTC c8c5b21a3714db3272f869c82f3ce862ed9c2cc6
1 file changed +1 -5
Makefile
+1 -5
@@ -297,13 +297,9 @@ all:
297 git: git.sh Makefile
298 rm -f $@+ $@
299 sed -e '1s|#!.*/sh|#!$(SHELL_PATH)|' \
300 -<<<<<<< Makefile
301 - -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
302 - -e 's/@@X@@/$(X)/g' <$@.sh >$@+
303 -=======
300 -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
301 + -e 's/@@X@@/$(X)/g' \
302 $(GIT_LIST_TWEAK) <$@.sh >$@+
306 ->>>>>>> .merge_file_3QHyD4
303 chmod +x $@+
304 mv $@+ $@
305