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

diff --git a/git-ls-remote.sh b/git-ls-remote.sh
index f0f0b07f6f8c85219104303d65dabbba80fd3098..dc6a775a9be83cfd349773b07051cd256d5ea114 100755 (executable)
--- a/git-ls-remote.sh
+++ b/git-ls-remote.sh
@@ -1,6 +1,5 @@
 #!/bin/sh
 #
-. git-sh-setup
 
 usage () {
     echo >&2 "usage: $0 [--heads] [--tags] <repository> <refs>..."