Merge https://github.com/prati0100/git-gui

* https://github.com/prati0100/git-gui: git-gui: Handle Ctrl + BS/Del in the commit msg Subject: git-gui: fix syntax error because of missing semicolon
2020-05-21 11:15:04 -07:00
parent 87680d32ef c195247812
commit ae92ac8ae3
3 changed files with 8 additions and 6 deletions
--- 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} {