| commit | 63a58457e094c9c9bbf562b872009d32f1f88133 | [log] [tgz] |
|---|---|---|
| author | Pratyush Yadav <me@yadavpratyush.com> | Tue Feb 18 23:01:44 2020 +0530 |
| committer | Pratyush Yadav <me@yadavpratyush.com> | Tue Feb 18 23:01:44 2020 +0530 |
| tree | a5b1bc53e2d2d49ae2acc970b962aafde2fe0195 | |
| parent | 5897e5ac965a17e0396039f5d236a7608265e691 [diff] | |
| parent | 6b9919c0a21ab516626f5e1849293df7cda1dd64 [diff] |
Merge branch 'py/missing-bracket' Fix an error popping up because of an unmatched closed bracket. * py/missing-bracket: git-gui: add missing close bracket
diff --git a/lib/merge.tcl b/lib/merge.tcl index 8df8ffa..664803c 100644 --- a/lib/merge.tcl +++ b/lib/merge.tcl
@@ -244,7 +244,7 @@ set status_bar_operation [$::main_status \ start \ [mc "Aborting"] \ - [mc "files reset"] + [mc "files reset"]] fileevent $fd readable [namespace code [list \ _reset_wait $fd $status_bar_operation]] } else {