X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=git-gui%2Flib%2Fmerge.tcl;h=283e4915e928df0c188d8ed2ec49e49eeed3b519;hb=cc6b41cc7d38c1b2de9809c0995087a2378d27ec;hp=5c01875b051305b5b40a17ac7a2245f69081f41b;hpb=a1eb73d917e15cd97314e0a39cbe857329339a96;p=git.git

diff --git a/git-gui/lib/merge.tcl b/git-gui/lib/merge.tcl
index 5c01875b0..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.