* [PATCH] git-gui: Fix switch statement in lib/merge.tcl
@ 2008-10-08 8:03 Johannes Sixt
0 siblings, 0 replies; only message in thread
From: Johannes Sixt @ 2008-10-08 8:03 UTC (permalink / raw)
To: Shawn O. Pearce; +Cc: Alexander Gavrilov, Git Mailing List
From: Johannes Sixt <johannes.sixt@telecom.at>
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>
---
lib/merge.tcl | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/lib/merge.tcl b/lib/merge.tcl
index ac4c7de..283e491 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.
--
1.6.0.2.1596.g729fb
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2008-10-08 8:05 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-10-08 8:03 [PATCH] git-gui: Fix switch statement in lib/merge.tcl Johannes Sixt
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).