about summary refs log tree commit diff
path: root/third_party/git/git-gui/lib/mergetool.tcl
diff options
context:
space:
mode:
Diffstat (limited to 'third_party/git/git-gui/lib/mergetool.tcl')
-rw-r--r--third_party/git/git-gui/lib/mergetool.tcl2
1 files changed, 1 insertions, 1 deletions
diff --git a/third_party/git/git-gui/lib/mergetool.tcl b/third_party/git/git-gui/lib/mergetool.tcl
index 120bc4064b6f..e688b016ef6c 100644
--- a/third_party/git/git-gui/lib/mergetool.tcl
+++ b/third_party/git/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} {