diff options
Diffstat (limited to 'git-gui/lib/index.tcl')
| -rw-r--r-- | git-gui/lib/index.tcl | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/git-gui/lib/index.tcl b/git-gui/lib/index.tcl index b045219a1..d33896a0c 100644 --- a/git-gui/lib/index.tcl +++ b/git-gui/lib/index.tcl @@ -298,11 +298,18 @@ proc add_helper {txt paths} { set after {} foreach path $paths { switch -glob -- [lindex $file_states($path) 0] { + _U - + U? { + if {$path eq $current_diff_path} { + unlock_index + merge_stage_workdir $path + return + } + } _O - ?M - ?D - - ?T - - U? { + ?T { lappend pathList $path if {$path eq $current_diff_path} { set after {reshow_diff;} |