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 /git-gui/lib/commit.tcl | |
| parent | 48c74a58b129e7230d74b2fba5c2d29eaa1f11dc (diff) | |
| download | git-ff515d81faa22f26b611ed7fd06a76d0c300ea39.tar.gz | |
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 'git-gui/lib/commit.tcl')
0 files changed, 0 insertions, 0 deletions