summaryrefslogtreecommitdiff
path: root/git-gui/lib/merge.tcl
diff options
context:
space:
mode:
authorPratyush Yadav <me@yadavpratyush.com>2020-02-18 17:31:44 (GMT)
committerPratyush Yadav <me@yadavpratyush.com>2020-02-18 17:31:44 (GMT)
commit63a58457e094c9c9bbf562b872009d32f1f88133 (patch)
treea5b1bc53e2d2d49ae2acc970b962aafde2fe0195 /git-gui/lib/merge.tcl
parent5897e5ac965a17e0396039f5d236a7608265e691 (diff)
parent6b9919c0a21ab516626f5e1849293df7cda1dd64 (diff)
downloadgit-63a58457e094c9c9bbf562b872009d32f1f88133.zip
git-63a58457e094c9c9bbf562b872009d32f1f88133.tar.gz
git-63a58457e094c9c9bbf562b872009d32f1f88133.tar.bz2
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 'git-gui/lib/merge.tcl')
0 files changed, 0 insertions, 0 deletions