mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-gui: Support conflict states _U & UT.

Browse Source 
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>
This commit is contained in:
Alexander Gavrilov
2008-08-31 01:00:49 +04:00
committed by Shawn O. Pearce
parent 48c74a58b1
commit ff515d81fa
4 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/commit.tcl
View File

@ -151,6 +151,7 @@ The rescan will be automatically started now.
D? -
T_ -
M? {set files_ready 1}
_U -
U? {
error_popup [mc "Unmerged files cannot be committed.