| commit | a910898e86be79c580d1e643cdbee8a19a7cd691 | [log] [tgz] |
|---|---|---|
| author | Johannes Sixt <johannes.sixt@telecom.at> | Wed Oct 08 10:03:54 2008 +0200 |
| committer | Shawn O. Pearce <spearce@spearce.org> | Fri Oct 10 09:31:58 2008 -0700 |
| tree | 685da73d9fc31bf229c07364e63fe24bf2e18a3c | |
| parent | 0b32cab933e0d3d1e85d4cb86669e33ef478ef66 [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>