diff options
| author |  Alexander Gavrilov <angavrilov@gmail.com> | 2008-08-31 01:00:49 +0400 |
|---|---|---|
| committer |  Shawn O. Pearce <spearce@spearce.org> | 2008-09-04 21:28:55 -0700 |
| commit | ff515d81faa22f26b611ed7fd06a76d0c300ea39 (patch) | |
| tree | d36f97dfe3dafaf08f62974f70b3a3ae740d7173 /lib/diff.tcl | |
| parent | git-gui: Support more merge tools. (diff) | |
| download | tgif-ff515d81faa22f26b611ed7fd06a76d0c300ea39.tar.xz | |
git-gui: Support conflict states _U & UT.
Support _U (local deleted, remote modified) and
UT (file type changed in conflict) modes.
Note that 'file type changed' does not refer to
changes in the executable bit, instead it denotes
replacing a file with a link, or vice versa.
Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Diffstat (limited to 'lib/diff.tcl')
| -rw-r--r-- | lib/diff.tcl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/diff.tcl b/lib/diff.tcl index 4a7138be9c..14a479ffdf 100644 --- 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 |