git-p4: Unset P4DIFF environment variable when using 'p4 -du diff'

diff --git a/git-gui/lib/about.tcl b/git-gui/lib/about.tcl
index 719fc547b3e157cdb14a8a09ba77a1d7c5f1f585..241ab892cd5b731f07571acf7a0ca3150a763f4f 100644 (file)
--- a/git-gui/lib/about.tcl
+++ b/git-gui/lib/about.tcl
@@ -4,6 +4,7 @@
 proc do_about {} {
        global appvers copyright oguilib
        global tcl_patchLevel tk_patchLevel
+       global ui_comm_spell
 
        set w .about_dialog
        toplevel $w
@@ -40,6 +41,11 @@ proc do_about {} {
                append v "Tcl version $tcl_patchLevel"
                append v ", Tk version $tk_patchLevel"
        }
+       if {[info exists ui_comm_spell]
+               && [$ui_comm_spell version] ne {}} {
+               append v "\n"
+               append v [$ui_comm_spell version]
+       }
 
        set d {}
        append d "git wrapper: $::_git\n"