diff options
| author |  Pratyush Yadav <me@yadavpratyush.com> | 2020-02-18 23:01:44 +0530 |
|---|---|---|
| committer | Pratyush Yadav <me@yadavpratyush.com> | 2020-02-18 23:01:44 +0530 |
| commit | 63a58457e094c9c9bbf562b872009d32f1f88133 (patch) | |
| tree | a5b1bc53e2d2d49ae2acc970b962aafde2fe0195 /lib/merge.tcl | |
| parent | Merge branch 'cs/german-translation' (diff) | |
| parent | git-gui: add missing close bracket (diff) | |
| download | tgif-63a58457e094c9c9bbf562b872009d32f1f88133.tar.xz | |
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
Diffstat (limited to 'lib/merge.tcl')
| -rw-r--r-- | lib/merge.tcl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/merge.tcl b/lib/merge.tcl index 8df8ffae55..664803cf3f 100644 --- a/lib/merge.tcl +++ b/lib/merge.tcl @@ -244,7 +244,7 @@ Continue with resetting the current changes?"] 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 { |