H0llyW00dzZ/git
H0llyW00dzZ/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2025-04-07 22:23:57 +00:00
Code Releases Activity

git-gui: Fix switch statement in lib/merge.tcl

Browse Source 
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>
This commit is contained in:
Johannes Sixt 2008-10-08 10:03:54 +02:00 committed by Shawn O. Pearce
parent 0b32cab933
commit a910898e86
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/merge.tcl
View File

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