Merge branch 'cc/replace-no-replace'

diff --git a/git-web--browse.sh b/git-web--browse.sh
index 4f5c740df5651853e575ba68366152992b0f043d..a578c3a73203fbf1bf4abfb024b1e83c45f2b2ce 100755 (executable)
--- a/git-web--browse.sh
+++ b/git-web--browse.sh
@@ -111,7 +111,8 @@ if test -z "$browser" ; then
        browser_candidates="w3m links lynx"
     fi
     # SECURITYSESSIONID indicates an OS X GUI login session
-    if test -n "$SECURITYSESSIONID"; then
+    if test -n "$SECURITYSESSIONID" \
+           -o "$TERM_PROGRAM" = "Apple_Terminal" ; then
        browser_candidates="open $browser_candidates"
     fi
     # /bin/start indicates MinGW