Jun 05, 2010 at 11:07:32AM -0700, Junio C Hamano wrote:
> @@ -1582,6 +1583,7 @@ define cmd_munge_script
> $(RM) $@ $@+ && \
> sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
> -e 's|@SHELL_PATH@|$(SHELL_PATH_SQ)|' \
> + -e 's|@@DIFF@@|$(DIFF_SQ)|' \
> -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
> -e 's/@@NO_CURL@@/$(NO_CURL)/g' \
> -e $(BROKEN_PATH_FIX) \
> diff --git a/git-merge-one-file.sh b/git-merge-one-file.sh
> index 3145009..b86402a 100755
> --- a/git-merge-one-file.sh
> +++ b/git-merge-one-file.sh
> @@ -107,7 +107,7 @@ case "${1:-.}${2:-.}${3:-.}" in
> # remove lines that are unique to ours.
> orig=`git-unpack-file $2`
> sz0=`wc -c <"$orig"`
> - $DIFF -u -La/$orig -Lb/$orig $orig $src2 | git apply --no-add
> + @@DIFF@@ -u -La/$orig -Lb/$orig $orig $src2 | git apply --no-add
> sz1=`wc -c <"$orig"`
>
> # If we do not have enough common material, it is not
Looks good to me. Thanks.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html