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~104^2~9
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/a910898e86be79c580d1e643cdbee8a19a7cd691?hp=a910898e86be79c580d1e643cdbee8a19a7cd691

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