diff options
| author |  Pratyush Yadav <me@yadavpratyush.com> | 2020-05-05 17:31:05 +0530 |
|---|---|---|
| committer | Pratyush Yadav <me@yadavpratyush.com> | 2020-05-05 17:31:05 +0530 |
| commit | 88db24d724619d6c2e602c3b56016f59326d31e3 (patch) | |
| tree | 5bfca451d4e4238151e3766db8d912d7295cadd1 /lib/mergetool.tcl | |
| parent | Merge branch 'py/remove-tcloo' (diff) | |
| parent | Subject: git-gui: fix syntax error because of missing semicolon (diff) | |
| download | tgif-88db24d724619d6c2e602c3b56016f59326d31e3.tar.xz | |
Merge branch 'ar/ui-ready-semicolon'
Fix syntax error popups because of missing semicolons.
* ar/ui-ready-semicolon:
Subject: git-gui: fix syntax error because of missing semicolon
Diffstat (limited to 'lib/mergetool.tcl')
| -rw-r--r-- | lib/mergetool.tcl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/mergetool.tcl b/lib/mergetool.tcl index 120bc4064b..e688b016ef 100644 --- a/lib/mergetool.tcl +++ b/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} { |