diff options
| -rwxr-xr-x | git-merge.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-merge.sh b/git-merge.sh index 272f004622..efdbabf775 100755 --- a/git-merge.sh +++ b/git-merge.sh @@ -189,7 +189,7 @@ else merge_name=$(for remote do rh=$(git-rev-parse --verify "$remote"^0 2>/dev/null) && - bh=$(git show-ref -s --verify "refs/heads/$remote") && + bh=$(git show-ref -s --verify "refs/heads/$remote" 2>/dev/null) && if test "$rh" = "$bh" then echo "$rh branch '$remote' of ." |