X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-gui%2Flib%2Findex.tcl;h=d33896a0ce26dd34c8024e21c71123e62832b8c0;hb=42fc11c1103a88c49233f04dc0c2f5659b3973fe;hp=b045219a1cca6bf46218bf211c0c88b8d699e144;hpb=78a935d48b28ebf5b1af348d7e57763f2955afd1;p=git.git

diff --git a/git-gui/lib/index.tcl b/git-gui/lib/index.tcl
index b045219a1..d33896a0c 100644
--- a/git-gui/lib/index.tcl
+++ b/git-gui/lib/index.tcl
@@ -298,11 +298,18 @@ proc add_helper {txt paths} {
 	set after {}
 	foreach path $paths {
 		switch -glob -- [lindex $file_states($path) 0] {
+		_U -
+		U? {
+			if {$path eq $current_diff_path} {
+				unlock_index
+				merge_stage_workdir $path
+				return
+			}
+		}
 		_O -
 		?M -
 		?D -
-		?T -
-		U? {
+		?T {
 			lappend pathList $path
 			if {$path eq $current_diff_path} {
 				set after {reshow_diff;}