merge-recursive: match the unmerged index entry behaviour with merge-resolve

[git.git] / git-applypatch.sh

diff --git a/git-applypatch.sh b/git-applypatch.sh
index 66fd19ae2df2e1f44b709a20802342c88d9d2cf2..f0549960fbd706f06fff5b2c602450917505a1ad 100755 (executable)
--- a/git-applypatch.sh
+++ b/git-applypatch.sh
@@ -10,7 +10,7 @@
 ##     $3 - "info" file with Author, email and subject
 ##     $4 - optional file containing signoff to add
 ##
-. git-sh-setup || die "Not a git archive."
+. git-sh-setup
 
 final=.dotest/final-commit
 ##