Merge branch 'maint'

* maint:
git-gui: Trim trailing slashes from untracked submodule names
git-gui: Assume untracked directories are Git submodules
git-gui: handle "deleted symlink" diff marker
git-gui: show unstaged symlinks in diff viewer

diff --cc git-gui.sh
Simple merge

diff --cc lib/diff.tcl
index b1129d551b31184f530f52d4e432f1e056e0d630,694834ab7a515667dbd14b38165fbe74b37a0349..d0134096409c78221fe5dd46e9af714e555965f5
--- 1/lib/diff.tcl
--- 2/lib/diff.tcl
+++ b/lib/diff.tcl
@@@ -98,7 -116,9 +116,12 @@@ proc show_diff {path w {lno {}}} 
                        return
                }
                $ui_diff conf -state normal
-               if {![catch {set type [exec file $path]}]} {
+               if {$type eq {submodule}} {
 -                      $ui_diff insert end "* Git Repository (subproject)\n" d_@
++                      $ui_diff insert end [append \
++                              "* " \
++                              [mc "Git Repository (subproject)"] \
++                              "\n"] d_@
+               } elseif {![catch {set type [exec file $path]}]} {
                        set n [string length $path]
                        if {[string equal -length $n $path $type]} {
                                set type [string range $type $n end]