X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-gui%2Flib%2Fmerge.tcl;h=283e4915e928df0c188d8ed2ec49e49eeed3b519;hb=cc6b41cc7d38c1b2de9809c0995087a2378d27ec;hp=cc26b0780882b6e8bde122c2a724d110f439d84f;hpb=92798702cf6d201f80e257a07d0a0c40565c79fe;p=git.git

diff --git a/git-gui/lib/merge.tcl b/git-gui/lib/merge.tcl
index cc26b0780..283e4915e 100644
--- a/git-gui/lib/merge.tcl
+++ b/git-gui/lib/merge.tcl
@@ -40,6 +40,7 @@ The rescan will be automatically started now.
 		_O {
 			continue; # and pray it works!
 		}
+		_U -
 		U? {
 			error_popup [mc "You are in the middle of a conflicted merge.
 
@@ -257,6 +258,7 @@ proc _reset_wait {fd} {
 
 		catch {file delete [gitdir MERGE_HEAD]}
 		catch {file delete [gitdir rr-cache MERGE_RR]}
+		catch {file delete [gitdir MERGE_RR]}
 		catch {file delete [gitdir SQUASH_MSG]}
 		catch {file delete [gitdir MERGE_MSG]}
 		catch {file delete [gitdir GITGUI_MSG]}