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

diff --git a/git-am.sh b/git-am.sh
index 8f073c90f6dce20e6e4f3a0b3046cc25dfd503e0..660b3a4b6113f58ff33fd2db2cdeac25ce32f95d 100755 (executable)
--- a/git-am.sh
+++ b/git-am.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 #
-. git-sh-setup || die "Not a git archive"
+. git-sh-setup
 
 usage () {
     echo >&2 "usage: $0 [--signoff] [--dotest=<dir>] [--utf8] [--binary] [--3way] <mbox>"