X-Git-Url: http://git.tremily.us/?a=blobdiff_plain;f=git-gui%2Flib%2Fcommit.tcl;h=2977315624fc5deeecff275d8dc8b3f2e3210a70;hb=5fc3e67ac0241c491dcf1c0c9dcd4a4d83e7c243;hp=40a710355751836e78b65101592b753266f507ca;hpb=d96ca27e1089a190139591ac365873f26bffcf5c;p=git.git

diff --git a/git-gui/lib/commit.tcl b/git-gui/lib/commit.tcl
index 40a710355..297731562 100644
--- a/git-gui/lib/commit.tcl
+++ b/git-gui/lib/commit.tcl
@@ -149,7 +149,9 @@ The rescan will be automatically started now.
 		_? {continue}
 		A? -
 		D? -
+		T_ -
 		M? {set files_ready 1}
+		_U -
 		U? {
 			error_popup [mc "Unmerged files cannot be committed.
 
@@ -428,6 +430,7 @@ A rescan will be automatically started now.
 		__ -
 		A_ -
 		M_ -
+		T_ -
 		D_ {
 			unset file_states($path)
 			catch {unset selected_paths($path)}