X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;ds=sidebyside;f=git-merge.sh;h=d352a3cf65e45e0da0a8ee1989e9acb522e132b5;hb=b933e818e951c290e8355ae544567bba949f392e;hp=255476e2deda1e5c7f9654fd92ba9d1950b1a3b7;hpb=fbf8ac212caa74fc506434da83f8e9630b09ed12;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='
 '