aboutsummaryrefslogtreecommitdiff
path: root/git-resolve.sh
diff options
context:
space:
mode:
Diffstat (limited to 'git-resolve.sh')
-rwxr-xr-xgit-resolve.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-resolve.sh b/git-resolve.sh
index 7d8fb54f9..fcc5ad734 100755
--- 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>"