From: Johannes Sixt <johannes.sixt@telecom.at>
Date: Wed, 8 Oct 2008 08:03:54 +0000 (+0200)
Subject: git-gui: Fix switch statement in lib/merge.tcl
X-Git-Tag: v1.6.1-rc1~3^2~25
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=a910898e86be79c580d1e643cdbee8a19a7cd691;p=git.git

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 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.