applypatch: use "index" lines not "applies-to".

diff --git a/git-octopus.sh b/git-octopus.sh
index d2471af3c8a002c175bf9b1370039b9e7d4ab946..2edbf52c42d329bc1cd091f0ec07f6ccf032478e 100755 (executable)
--- a/git-octopus.sh
+++ b/git-octopus.sh
@@ -4,7 +4,7 @@
 #
 # Resolve two or more trees recorded in $GIT_DIR/FETCH_HEAD.
 #
-. git-sh-setup || die "Not a git archive"
+. git-sh-setup
 
 usage () {
     die "usage: git octopus"