![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Alexander Gavrilov <angavrilov@gmail.com> | |
| Sat, 30 Aug 2008 21:00:49 +0000 (01:00 +0400) | ||
| committer | Shawn O. Pearce <spearce@spearce.org> | |
| Fri, 5 Sep 2008 04:28:55 +0000 (21:28 -0700) | ||
| commit | ff515d81faa22f26b611ed7fd06a76d0c300ea39 | |
| tree | d36f97dfe3dafaf08f62974f70b3a3ae740d7173 | tree | snapshot |
| parent | 48c74a58b129e7230d74b2fba5c2d29eaa1f11dc | commit | diff |
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>
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>
| git-gui.sh | diff | blob | history | |
| lib/commit.tcl | diff | blob | history | |
| lib/diff.tcl | diff | blob | history | |
| lib/index.tcl | diff | blob | history |