X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-merge.sh;fp=git-merge.sh;h=d352a3cf65e45e0da0a8ee1989e9acb522e132b5;hb=ae2b0f15180d4b044828c836bcab6a990efa5c8e;hp=255476e2deda1e5c7f9654fd92ba9d1950b1a3b7;hpb=e8cc80d03934cc607e3a4d89a05350c238dbf9c5;p=git.git

diff --git a/git-merge.sh b/git-merge.sh
index 255476e2..d352a3cf 100755
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -3,7 +3,7 @@
 # Copyright (c) 2005 Junio C Hamano
 #
 
-. git-sh-setup || die "Not a git archive"
+. git-sh-setup
 
 LF='
 '