From ff515d81faa22f26b611ed7fd06a76d0c300ea39 Mon Sep 17 00:00:00 2001 From: Alexander Gavrilov Date: Sun, 31 Aug 2008 01:00:49 +0400 Subject: 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 Signed-off-by: Shawn O. Pearce --- lib/commit.tcl | 1 + 1 file changed, 1 insertion(+) (limited to 'lib/commit.tcl') diff --git a/lib/commit.tcl b/lib/commit.tcl index f4ab70784c..2977315624 100644 --- a/lib/commit.tcl +++ b/lib/commit.tcl @@ -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. -- cgit v1.2.3