diff options
| author | Alexander Gavrilov <angavrilov@gmail.com> | 2008-08-30 23:00:49 +0200 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2008-09-05 06:28:55 +0200 |
| commit | ff515d81faa22f26b611ed7fd06a76d0c300ea39 (patch) | |
| tree | d36f97dfe3dafaf08f62974f70b3a3ae740d7173 /lib/index.tcl | |
| parent | git-gui: Support more merge tools. (diff) | |
| download | git-ff515d81faa22f26b611ed7fd06a76d0c300ea39.tar.xz git-ff515d81faa22f26b611ed7fd06a76d0c300ea39.zip | |
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 '')
| -rw-r--r-- | lib/index.tcl | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/index.tcl b/lib/index.tcl index d011406462..b045219a1c 100644 --- a/lib/index.tcl +++ b/lib/index.tcl @@ -164,6 +164,7 @@ proc write_update_index {fd pathList totalCnt batch after} { _O - AM {set new A_} _T {set new T_} + _U - U? { if {[file exists $path]} { set new M_ |