Documentation/git-ls-remote.txt: Add -h and -t.

diff --git a/git-merge.sh b/git-merge.sh
index 255476e2deda1e5c7f9654fd92ba9d1950b1a3b7..a221daa7f4882892b29b19b156dfc31986fc8912 100755 (executable)
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -3,7 +3,7 @@
 # Copyright (c) 2005 Junio C Hamano
 #
 
-. git-sh-setup || die "Not a git archive"
+. git-sh-setup
 
 LF='
 '
@@ -273,7 +273,8 @@ fi
 case "$best_strategy" in
 '')
        restorestate
-       die "No merge strategy handled the merge."
+       echo >&2 "No merge strategy handled the merge."
+       exit 2
        ;;
 "$wt_strategy")
        # We already have its result in the working tree.