git-gui: Support conflict states _U & UT.

diff --git a/lib/diff.tcl b/lib/diff.tcl
index 4a7138be9c0a860d7b4a9820a6d796fa3cabc700..14a479ffdf09ecf0f3938e3a5f0de1e52fc903f1 100644 (file)
--- a/lib/diff.tcl
+++ b/lib/diff.tcl
@@ -166,7 +166,7 @@ proc show_diff {path w {lno {}} {scroll_pos {}}} {
                lappend cmd diff-index
                lappend cmd --cached
        } elseif {$w eq $ui_workdir} {
-               if {[string index $m 0] eq {U}} {
+               if {[string first {U} $m] >= 0} {
                        lappend cmd diff
                } else {
                        lappend cmd diff-files