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

diff --git a/git-gui/lib/error.tcl b/git-gui/lib/error.tcl
index 8c27678e3a45c011cfc6a21f5d53b0d87c66b4a6..75650157e551e34dab650d89f3fa6d25afc91d6a 100644 (file)
--- a/git-gui/lib/error.tcl
+++ b/git-gui/lib/error.tcl
@@ -80,7 +80,9 @@ proc hook_failed_popup {hook msg {is_fatal 1}} {
                -justify left \
                -font font_uibold
        text $w.m.t \
-               -background white -borderwidth 1 \
+               -background white \
+               -foreground black \
+               -borderwidth 1 \
                -relief sunken \
                -width 80 -height 10 \
                -font font_diff \