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>
Johannes Sixt committed
Oct 8, 2008 at 10:03 UTC
a910898e86be79c580d1e643cdbee8a19a7cd691
1 file changed
+1
-1
lib/merge.tcl
+1
-1
@@ -40,7 +40,7 @@ The rescan will be automatically started now.
40
_O {
41
continue; # and pray it works!
42
}
43
- _U
43
+ _U -
44
U? {
45
error_popup [mc "You are in the middle of a conflicted merge.
46