diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-03-19 23:06:51 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-03-19 23:06:51 (GMT) |
| commit | 98cedd0233ee88e69711f79d1126b6bd772ff5bd (patch) | |
| tree | 54a5e5c17d069d5d5ac3283d38a892c3e010d0a4 /git-gui/lib/merge.tcl | |
| parent | 7fcb9659703b9dd611acb7cb85752be8ba4dcf31 (diff) | |
| parent | a5728022e07c53e5ac91db0960870518e243b7c1 (diff) | |
| download | git-98cedd0233ee88e69711f79d1126b6bd772ff5bd.zip git-98cedd0233ee88e69711f79d1126b6bd772ff5bd.tar.gz git-98cedd0233ee88e69711f79d1126b6bd772ff5bd.tar.bz2 | |
Merge https://github.com/prati0100/git-gui
* 'master' of https://github.com/prati0100/git-gui:
git-gui: create a new namespace for chord script evaluation
git-gui: reduce Tcl version requirement from 8.6 to 8.5
git-gui--askpass: coerce answers to UTF-8 on Windows
git-gui: fix error popup when doing blame -> "Show History Context"
git-gui: add missing close bracket
git-gui: update German translation
git-gui: extend translation glossary template with more terms
git-gui: update pot template and German translation to current source code
Diffstat (limited to 'git-gui/lib/merge.tcl')
| -rw-r--r-- | git-gui/lib/merge.tcl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-gui/lib/merge.tcl b/git-gui/lib/merge.tcl index 8df8ffa..664803c 100644 --- a/git-gui/lib/merge.tcl +++ b/git-gui/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 { |