Merge branch 'jc/maint-rerere-in-workdir'

diff --git a/git-gui/lib/browser.tcl b/git-gui/lib/browser.tcl
index c2415729e036d87bc892b53901bd45d7e71b5ec2..a8c622351167be937b9f02df149a1a6ec2a16e98 100644 (file)
--- a/git-gui/lib/browser.tcl
+++ b/git-gui/lib/browser.tcl
@@ -121,7 +121,7 @@ method _parent {} {
                if {$browser_stack eq {}} {
                        regsub {:.*$} $browser_path {:} browser_path
                } else {
-                       regsub {/[^/]+$} $browser_path {} browser_path
+                       regsub {/[^/]+/$} $browser_path {/} browser_path
                }
                set browser_status [mc "Loading %s..." $browser_path]
                _ls $this [lindex $parent 0] [lindex $parent 1]