diff options
Diffstat (limited to 'lib/mergetool.tcl')
| -rw-r--r-- | lib/mergetool.tcl | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/lib/mergetool.tcl b/lib/mergetool.tcl index 5f3da1f623..79c58bc7bc 100644 --- a/lib/mergetool.tcl +++ b/lib/mergetool.tcl @@ -24,13 +24,9 @@ This operation can be undone only by restarting the merge." \ } proc merge_add_resolution {path} { - global current_diff_path + global current_diff_path ui_workdir - if {$path eq $current_diff_path} { - set after {reshow_diff;} - } else { - set after {} - } + set after [next_diff_after_action $ui_workdir $path {} {^_?U}] update_index \ [mc "Adding resolution for %s" [short_path $path]] \ |