Fix push with refspecs containing wildcards

diff --git a/git-merge-one-file.sh b/git-merge-one-file.sh
index 7d62d7902cb1d7cd2749091b86d532306bea89b3..254d210bdca128089da453988175e2324b837a85 100755 (executable)
--- a/git-merge-one-file.sh
+++ b/git-merge-one-file.sh
@@ -88,7 +88,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