summaryrefslogtreecommitdiff
path: root/git-gui/lib/merge.tcl
diff options
context:
space:
mode:
authorPratyush Yadav <me@yadavpratyush.com>2020-03-14 17:11:45 (GMT)
committerPratyush Yadav <me@yadavpratyush.com>2020-03-14 17:11:45 (GMT)
commitd769dcc5cdd92e046eadee3cf878afc7ca806b14 (patch)
treee5d885e9e2deb013d9efafc3e9429af1e6426448 /git-gui/lib/merge.tcl
parent63a58457e094c9c9bbf562b872009d32f1f88133 (diff)
parent5eb9397e88dfc04b9993484fe8835f7eebdf1100 (diff)
downloadgit-d769dcc5cdd92e046eadee3cf878afc7ca806b14.zip
git-d769dcc5cdd92e046eadee3cf878afc7ca806b14.tar.gz
git-d769dcc5cdd92e046eadee3cf878afc7ca806b14.tar.bz2
Merge branch 'py/blame-status-error'
Fixes an error popup in blame because of a missing closing bracket. * py/blame-status-error: git-gui: fix error popup when doing blame -> "Show History Context"
Diffstat (limited to 'git-gui/lib/merge.tcl')
0 files changed, 0 insertions, 0 deletions