From a910898e86be79c580d1e643cdbee8a19a7cd691 Mon Sep 17 00:00:00 2001 From: Johannes Sixt Date: Wed, 8 Oct 2008 10:03:54 +0200 Subject: [PATCH] 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 Signed-off-by: Shawn O. Pearce --- lib/merge.tcl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/merge.tcl b/lib/merge.tcl index ac4c7ded1..283e4915e 100644 --- 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. -- 2.11.4.GIT