diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-05-21 11:15:04 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-05-21 11:15:04 -0700 |
| commit | ae92ac8ae3838e72840f5d019195bb9c0c9e7b0e (patch) | |
| tree | a714586ef9da37deecf3861b2400f7c34dae19af /git-gui/lib/mergetool.tcl | |
| parent | 87680d32efb6d14f162e54ad3bda4e3d6c908559 (diff) | |
| parent | c195247812f8cd38ba7e1c603112e6c1d8d8e71e (diff) | |
| download | git-ae92ac8ae3838e72840f5d019195bb9c0c9e7b0e.tar.xz | |
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
Diffstat (limited to 'git-gui/lib/mergetool.tcl')
| -rw-r--r-- | git-gui/lib/mergetool.tcl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-gui/lib/mergetool.tcl b/git-gui/lib/mergetool.tcl index 120bc4064b..e688b016ef 100644 --- 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} { |