projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 0b32cab) | patch
git-gui: Fix switch statement in lib/merge.tcl
authorJohannes Sixt <johannes.sixt@telecom.at>
Wed, 8 Oct 2008 08:03:54 +0000 (10:03 +0200)
committerShawn O. Pearce <spearce@spearce.org>
Fri, 10 Oct 2008 16:31:58 +0000 (09:31 -0700)
commita910898e86be79c580d1e643cdbee8a19a7cd691
tree685da73d9fc31bf229c07364e63fe24bf2e18a3ctree | snapshot
parent0b32cab933e0d3d1e85d4cb86669e33ef478ef66commit | diff
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>
lib/merge.tcl diff | blob | history
Git—the stupid content tracker