diff --git a/git-gui/lib/merge.tcl b/git-gui/lib/merge.tcl
index 5c01875b051305b5b40a17ac7a2245f69081f41b..283e4915e928df0c188d8ed2ec49e49eeed3b519 100644 (file)
--- a/git-gui/lib/merge.tcl
+++ b/git-gui/lib/merge.tcl
_O {
continue; # and pray it works!
}
+ _U -
U? {
error_popup [mc "You are in the middle of a conflicted merge.