diff options
| author |  Johannes Sixt <johannes.sixt@telecom.at> | 2008-10-08 10:03:54 +0200 |
|---|---|---|
| committer |  Shawn O. Pearce <spearce@spearce.org> | 2008-10-10 09:31:58 -0700 |
| commit | a910898e86be79c580d1e643cdbee8a19a7cd691 (patch) | |
| tree | 685da73d9fc31bf229c07364e63fe24bf2e18a3c | |
| parent | git-gui: Fix fetching from remotes when adding them (diff) | |
| download | tgif-a910898e86be79c580d1e643cdbee8a19a7cd691.tar.xz | |
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>
| -rw-r--r-- | lib/merge.tcl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/merge.tcl b/lib/merge.tcl index ac4c7ded14..283e4915e9 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. |