Imported Upstream version 2.27.0

[platform/upstream/git.git] / git-gui / lib / mergetool.tcl

diff --git a/git-gui/lib/mergetool.tcl b/git-gui/lib/mergetool.tcl
index 120bc40..e688b01 100644 (file)
--- a/git-gui/lib/mergetool.tcl
+++ b/git-gui/lib/mergetool.tcl
@@ -59,7 +59,7 @@ proc merge_add_resolution {path} {
        update_index \
                [mc "Adding resolution for %s" [short_path $path]] \
                [list $path] \
-               [concat $after [list ui_ready]]
+               [concat $after {ui_ready;}]
 }
 
 proc merge_force_stage {stage} {