From: Johannes Sixt <j.sixt@viscovery.net>
To: "Shawn O. Pearce" <spearce@spearce.org>
Cc: Alexander Gavrilov <angavrilov@gmail.com>,
Git Mailing List <git@vger.kernel.org>
Subject: [PATCH] git-gui: Fix switch statement in lib/merge.tcl
Date: Wed, 08 Oct 2008 10:03:54 +0200 [thread overview]
Message-ID: <48EC696A.1000300@viscovery.net> (raw)
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
reply other threads:[~2008-10-08 8:05 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=48EC696A.1000300@viscovery.net \
--to=j.sixt@viscovery.net \
--cc=angavrilov@gmail.com \
--cc=git@vger.kernel.org \
--cc=spearce@spearce.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).