git-sh-setup: die if outside git repository.

[git.git] / git-merge.sh

diff --git a/git-merge.sh b/git-merge.sh
index 255476e..d352a3c 100755 (executable)
--- 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='
 '