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

[git.git] / git-resolve.sh
diff --git a/git-resolve.sh b/git-resolve.sh

index 7d8fb54f952e3f85c8c77b8fd9c67afbe76f0316..fcc5ad7349e3f77a6817e499b331b262c4a07b57 100755 (executable)
--- a/git-resolve.sh
+++ b/git-resolve.sh
@@ -4,7 +4,7 @@
  #
  # Resolve two trees.
  #
-. git-sh-setup || die "Not a git archive"
+. git-sh-setup
  
  usage () {
         die "git-resolve <head> <remote> <merge-message>"