kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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
maint
Pratyush Yadav 2020-02-18 23:01:44 +05:30
parent 5897e5ac96 6b9919c0a2
commit 63a58457e0
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/merge.tcl
View File

@ -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 {