git-gui: Fix switch statement in lib/merge.tcl

0aea2842 (Make Ctrl-T safe to use for conflicting files) introduced a new
case, but forgot the '-' to indicate that it shares the body with the
subsequent case label.

Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

diff --git a/lib/merge.tcl b/lib/merge.tcl
index ac4c7ded14ad485d62a1381c6c40ed4f32a748b9..283e4915e928df0c188d8ed2ec49e49eeed3b519 100644 (file)
--- a/lib/merge.tcl
+++ b/lib/merge.tcl
@@ -40,7 +40,7 @@ The rescan will be automatically started now.
                _O {
                        continue; # and pray it works!
                }
-               _U
+               _U -
                U? {
                        error_popup [mc "You are in the middle of a conflicted merge.