builtin/merge.c: drop a parameter that is never used

diff --git a/git-web--browse.sh b/git-web--browse.sh
index 1d72ec760e9d69e0fc29a699fa60be945f872a93..ebdfba6c94db947f66add0c1b4840319c12252ea 100755 (executable)
--- a/git-web--browse.sh
+++ b/git-web--browse.sh
@@ -34,7 +34,7 @@ valid_tool() {
        firefox | iceweasel | seamonkey | iceape | \
        chrome | google-chrome | chromium | chromium-browser | \
        konqueror | opera | w3m | elinks | links | lynx | dillo | open | \
-       start | cygstart)
+       start | cygstart | xdg-open)
                ;; # happy
        *)
                valid_custom_tool "$1" || return 1
@@ -112,7 +112,7 @@ fi
 
 if test -z "$browser" ; then
        if test -n "$DISPLAY"; then
-               browser_candidates="firefox iceweasel google-chrome chrome chromium chromium-browser konqueror opera seamonkey iceape w3m elinks links lynx dillo"
+               browser_candidates="firefox iceweasel google-chrome chrome chromium chromium-browser konqueror opera seamonkey iceape w3m elinks links lynx dillo xdg-open"
                if test "$KDE_FULL_SESSION" = "true"; then
                        browser_candidates="konqueror $browser_candidates"
                fi
@@ -179,7 +179,7 @@ konqueror)
                ;;
        esac
        ;;
-w3m|elinks|links|lynx|open|cygstart)
+w3m|elinks|links|lynx|open|cygstart|xdg-open)
        "$browser_path" "$@"
        ;;
 start)