grep: move logic to compile header pattern into a separate helper

diff --git a/git-merge-one-file.sh b/git-merge-one-file.sh
index 3145009f4be40d367f52f16dc2b7edb00d153137..b86402afa5d079df8d1cf6eebb15e5727cc8a5de 100755 (executable)
--- 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