diff options
| author |  Junio C Hamano <junkio@cox.net> | 2005-10-03 16:05:50 -0700 |
|---|---|---|
| committer |  Peter Anvin <hpa@tazenda.sc.orionmulti.com> | 2005-10-03 16:29:48 -0700 |
| commit | c8c5b21a3714db3272f869c82f3ce862ed9c2cc6 (patch) | |
| tree | b9f84c3ddee69e398106b1c6fbbc5ddb72875080 | |
| parent | Merge with master.kernel.org:/pub/scm/git/git.git (diff) | |
| download | tgif-c8c5b21a3714db3272f869c82f3ce862ed9c2cc6.tar.xz | |
[PATCH] Merging the Cygwin changes
Fix mismerge typo.
Signed-off-by: Junio C Hamano <junkio@cox.net>
| -rw-r--r-- | Makefile | 6 |
1 files changed, 1 insertions, 5 deletions
@@ -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 $@+ $@ |