{"thread":{"id":"15823","subject":"[PATCH] git-gui: Fix switch statement in lib/merge.tcl","startedAt":"2008-10-08T08:03:54Z","lastAt":"2008-10-08T08:03:54Z","messageCount":1,"participants":["Johannes Sixt"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"92604","messageId":"48EC696A.1000300@viscovery.net","threadId":"15823","inReplyTo":null,"subject":"[PATCH] git-gui: Fix switch statement in lib/merge.tcl","fromName":"Johannes Sixt","fromEmail":"j.sixt@viscovery.net","sentAt":"2008-10-08T08:03:54Z","receivedAt":"2008-10-08T08:03:54Z","isPatch":true,"sender":{"key":"j6t@kdbg.org","avatar":"https://avatars.githubusercontent.com/u/14810926?v=4"},"body":"From: Johannes Sixt <johannes.sixt@telecom.at>\n\n0aea2842 (Make Ctrl-T safe to use for conflicting files) introduced a new\ncase, but forgot the '-' to indicate that it shares the body with the\nsubsequent case label.\n\nSigned-off-by: Johannes Sixt <johannes.sixt@telecom.at>\n---\n lib/merge.tcl |    2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/lib/merge.tcl b/lib/merge.tcl\nindex ac4c7de..283e491 100644\n--- a/lib/merge.tcl\n+++ b/lib/merge.tcl\n@@ -40,7 +40,7 @@ The rescan will be automatically started now.\n \t\t_O {\n \t\t\tcontinue; # and pray it works!\n \t\t}\n-\t\t_U\n+\t\t_U -\n \t\tU? {\n \t\t\terror_popup [mc \"You are in the middle of a conflicted merge.\n\n-- \n1.6.0.2.1596.g729fb\n"}]}