Skip to content

Commit

Permalink
Merge branch 'py/missing-bracket'
Browse files Browse the repository at this point in the history
Fix an error popping up because of an unmatched closed bracket.

* py/missing-bracket:
  git-gui: add missing close bracket
  • Loading branch information
prati0100 committed Feb 18, 2020
2 parents 5897e5a + 6b9919c commit 63a5845
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion lib/merge.tcl
Expand Up @@ -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 {
Expand Down

0 comments on commit 63a5845

Please sign in to comment.