Merge http://www.kernel.org/pub/scm/gitk/gitk

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

index 7d8fb54..fcc5ad7 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>"